Version bump and explicitly depend on kdelibs-3.5* (fixes bug #219221).

Package-Manager: portage-2.1.5_rc6

6 files changed, 95 insertions, 8 deletions

diff --git a/sci-chemistry/chemtool/ChangeLog b/sci-chemistry/chemtool/ChangeLog
index 7ea68be2905c..3d8add5d21e5 100644
--- a/sci-chemistry/chemtool/ChangeLog
+++ b/sci-chemistry/chemtool/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/chemtool
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/ChangeLog,v 1.23 2008/04/22 13:54:33 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/ChangeLog,v 1.24 2008/04/26 13:03:47 markusle Exp $
+
+*chemtool-1.6.11 (26 Apr 2008)
+
+  26 Apr 2008; Markus Dittrich <markusle@gentoo.org>
+  chemtool-1.6.9-r1.ebuild, chemtool-1.6.10.ebuild, 
+  +files/chemtool-1.6.11-makefile.patch, +chemtool-1.6.11.ebuild:
+  Version bump and explicitly depend on kdelibs-3.5* (fixes bug #219221).
 
   22 Apr 2008; Jeff Gardner <je_fro@gentoo.org> chemtool-1.6.9-r1.ebuild:
   Fix typo
diff --git a/sci-chemistry/chemtool/Manifest b/sci-chemistry/chemtool/Manifest
index ef6bd0d348c2..1901e17aae95 100644
--- a/sci-chemistry/chemtool/Manifest
+++ b/sci-chemistry/chemtool/Manifest
@@ -1,6 +1,9 @@
+AUX chemtool-1.6.11-makefile.patch 453 RMD160 465f72d7b50b7df86a67f8a38961365946cb955b SHA1 13c85a240ed8e012925e55fab64419883fc89b59 SHA256 bc7358059bb83cdc7914d404d703e0866d19cf7f42d2b526db87a8a03ec4cc01
 DIST chemtool-1.6.10.tar.gz 466296 RMD160 4ca9f6bb75a8211f31150e93267a323456905388 SHA1 1ed84de17a802d8cc64b72499f6c6e4577a9f2c9 SHA256 9a4ba27e1a187efd46314b724b42862381360a08fe3939fea1e91127f8e5c53c
+DIST chemtool-1.6.11.tar.gz 720067 RMD160 46aa3fc5ff8929d5f2bfe8e14a62db965cf23f47 SHA1 f4c50264b1499bdac15854e4bffde1a9d85668b3 SHA256 3d57f14fa6be06a2fa7930f9ecf67fa7d29e059054151f57ea1a4aadc679f3f1
 DIST chemtool-1.6.9.tar.gz 430701 RMD160 9c156f91ab17721461d524f82f59b5d49cb46f7a SHA1 528f8603cd3965b89fb670e0fc7dc71ad3b7a147 SHA256 3a66286195e3e5a79000245c1c28eca6ef4deb0e19fe9c3b481bfbabb49a1a44
-EBUILD chemtool-1.6.10.ebuild 1585 RMD160 eccc03bb4daab0f93e4a8aa4d444de99b82cb104 SHA1 d2f2a8f53ad6b867d3389a2844428a7a05090f86 SHA256 61190caf07d6debd527b2a57178daf68bdccac1f2969367719137351bb61329c
-EBUILD chemtool-1.6.9-r1.ebuild 1585 RMD160 63eb50e35ffe62afc6ed849d30c8085f902384ab SHA1 e8c3bad5a2f4714f2b146b6285a2276381b80b07 SHA256 b843a3e592c16acb3e7588cd6fd8455f3338952b434c9366ff95b5250ee29286
-MISC ChangeLog 5494 RMD160 b8d0290ae983c65e6aab34513136318031950156 SHA1 3c79b422a0af4dab69908d157689707eb3b08f0a SHA256 3b81916ca94bf09e39c639a298900720d5496a8e8404768b56e08c0ead192d7f
+EBUILD chemtool-1.6.10.ebuild 1593 RMD160 2e473e591527822a9551ff54fa3c44fddd5bc364 SHA1 5d7dda921546509d2323a58d911d96392220fe96 SHA256 2fc28759465247ebdaab4b661eb46d9c88fb0aff5e171dcd22bb5802beddb86d
+EBUILD chemtool-1.6.11.ebuild 1677 RMD160 aeeb0a7429cb52c78aa78438a8d8f71dd79de4d9 SHA1 c457c1a8270488c023ba529f07a54649b5c120ad SHA256 069d4a48232ac3d4a0d68a0cfbc207cc292a881166f36943258a381c67dc131d
+EBUILD chemtool-1.6.9-r1.ebuild 1593 RMD160 17f94dd74b34dc624b22581e5898fc354bd0bf3f SHA1 618adba81e68887dd92ad948aa088ce40823fc79 SHA256 6bc2a67bd28d27a4fc941fbd4d8081ab18ef836491d4e18a7a8680acf953e973
+MISC ChangeLog 5775 RMD160 faf922c79840eec243d4c3446fb62f855509e50c SHA1 cd21a49d879fd2374c810cb7cad4086b774dfa62 SHA256 5d0a7dbff22606923c71a45d5e0a2ad62ea6c6d3695b7705feadf6bc46562703
 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852
diff --git a/sci-chemistry/chemtool/chemtool-1.6.10.ebuild b/sci-chemistry/chemtool/chemtool-1.6.10.ebuild
index ab31fc0f3153..6e725b747a07 100644
--- a/sci-chemistry/chemtool/chemtool-1.6.10.ebuild
+++ b/sci-chemistry/chemtool/chemtool-1.6.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/chemtool-1.6.10.ebuild,v 1.3 2008/04/21 01:40:11 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/chemtool-1.6.10.ebuild,v 1.4 2008/04/26 13:03:47 markusle Exp $
 
 inherit eutils kde-functions
 
@@ -15,7 +15,7 @@ IUSE="gnome kde nls"
 
 RDEPEND="media-gfx/transfig
 		=x11-libs/gtk+-2*
-		kde? ( kde-base/kdelibs )
+		kde? ( =kde-base/kdelibs-3.5* )
 		x86? ( media-libs/libemf )"
 
 DEPEND="${RDEPEND}
diff --git a/sci-chemistry/chemtool/chemtool-1.6.11.ebuild b/sci-chemistry/chemtool/chemtool-1.6.11.ebuild
new file mode 100644
index 000000000000..32cfcd3f1533
--- /dev/null
+++ b/sci-chemistry/chemtool/chemtool-1.6.11.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/chemtool-1.6.11.ebuild,v 1.1 2008/04/26 13:03:47 markusle Exp $
+
+inherit eutils kde-functions
+
+DESCRIPTION="program for drawing organic molecules"
+HOMEPAGE="http://ruby.chemie.uni-freiburg.de/~martin/chemtool/"
+SRC_URI="http://ruby.chemie.uni-freiburg.de/~martin/chemtool/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="gnome kde nls"
+
+RDEPEND="media-gfx/transfig
+		=x11-libs/gtk+-2*
+		kde? ( =kde-base/kdelibs-3.5* )
+		x86? ( media-libs/libemf )"
+
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	local config_opts
+	local mycppflags
+	if ! use kde; then
+		unset KDEDIR
+		config_opts="${config_opts} --without-kdedir"
+	else
+		set-kdedir
+		config_opts="${config_opts} --with-kdedir=${KDEDIR}"
+	fi
+	if [ ${ARCH} = "x86"  ]; then
+		config_opts="${config_opts} --enable-emf"
+		mycppflags="${mycppflags} -I /usr/include/libEMF"
+	fi
+
+	sed -e "s:\(^CPPFLAGS.*\):\1 ${mycppflags}:" -i Makefile.in || \
+		die "could not append cppflags"
+
+	if use gnome ; then
+		config_opts="${config_opts} --with-gnomedir=/usr" ;
+	else
+		config_opts="${config_opts} --without-gnomedir" ;
+	fi
+
+	econf ${config_opts} --enable-menu \
+		|| die "./configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc ChangeLog INSTALL README TODO
+	insinto /usr/share/${PN}/examples
+	doins "${S}"/examples/*
+	if ! use nls; then rm -rf "${D}"/usr/share/locale; fi
+}
diff --git a/sci-chemistry/chemtool/chemtool-1.6.9-r1.ebuild b/sci-chemistry/chemtool/chemtool-1.6.9-r1.ebuild
index f3dd2d19e17f..25e2cbbe2e51 100644
--- a/sci-chemistry/chemtool/chemtool-1.6.9-r1.ebuild
+++ b/sci-chemistry/chemtool/chemtool-1.6.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/chemtool-1.6.9-r1.ebuild,v 1.7 2008/04/22 13:54:33 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/chemtool-1.6.9-r1.ebuild,v 1.8 2008/04/26 13:03:47 markusle Exp $
 
 inherit eutils kde-functions
 
@@ -15,7 +15,7 @@ IUSE="gnome kde nls"
 
 RDEPEND=">=media-gfx/transfig-3.2.3d
 		=x11-libs/gtk+-2*
-		kde? ( kde-base/kdelibs )
+		kde? ( =kde-base/kdelibs-3.5* )
 		x86? ( >=media-libs/libemf-1.0 )"
 
 DEPEND="${RDEPEND}
diff --git a/sci-chemistry/chemtool/files/chemtool-1.6.11-makefile.patch b/sci-chemistry/chemtool/files/chemtool-1.6.11-makefile.patch
new file mode 100644
index 000000000000..f359578dce0b
--- /dev/null
+++ b/sci-chemistry/chemtool/files/chemtool-1.6.11-makefile.patch
@@ -0,0 +1,12 @@
+diff -Naur chemtool-1.6.11/Makefile.in chemtool-1.6.11.new/Makefile.in
+--- chemtool-1.6.11/Makefile.in	2007-08-26 07:53:59.000000000 -0400
++++ chemtool-1.6.11.new/Makefile.in	2008-04-26 08:52:33.000000000 -0400
+@@ -230,7 +230,7 @@
+ AM_CPPFLAGS = -I. -I$(srcdir) @GTK_CFLAGS@
+ 
+ # Link time dependencies.
+-LDADD = @LIBINTL@ @GTK_LIBS@
++LDADD = @LIBINTL@ @GTK_LIBS@ @EMFLIBS@
+ 
+ # Additional files to be distributed.
+ EXTRA_DIST = autogen.sh autoclean.sh