Bugfix for 24984

3 files changed, 25 insertions, 16 deletions

diff --git a/app-sci/chemtool/ChangeLog b/app-sci/chemtool/ChangeLog
index da1701cfdf42..143e365a5e32 100644
--- a/app-sci/chemtool/ChangeLog
+++ b/app-sci/chemtool/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-sci/chemtool
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/chemtool/ChangeLog,v 1.4 2003/07/17 13:09:19 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/chemtool/ChangeLog,v 1.5 2003/08/06 06:47:11 phosphan Exp $
+
+  06 Aug 2003; Patrick Kursawe <phosphan@gentoo.org> chemtool-1.6.ebuild:
+  Trying to fix bug 24984, no revision bump necessary.
 
 *chemtool-1.6 (17 Jul 2003)
 
diff --git a/app-sci/chemtool/Manifest b/app-sci/chemtool/Manifest
index 28b057c52196..e91cc6b336eb 100644
--- a/app-sci/chemtool/Manifest
+++ b/app-sci/chemtool/Manifest
@@ -1,11 +1,11 @@
-MD5 85997784eda14376edb5a380af598393 files/Makefile.in-chemtool-1.5-gentoo.diff 2715
+MD5 943433311093a1592e1ac8e1eeed2491 chemtool-1.6.ebuild 2153
+MD5 688b7e71b424ea48eb9cd4b67f227f5c chemtool-1.5.ebuild 1756
+MD5 8a36c2c64f8afa1cace195f05aa6b5cf ChangeLog 1085
+MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 55ed6136e52ec1136e015844186dd7ba files/config.h.in-chemtool-1.5-gentoo.diff 368
-MD5 55ee243e7331b078a204b1ad52ef4146 files/configure.in-chemtool-1.5-gentoo.diff 2069
 MD5 776f1a36180ed2f86a523e6119066079 files/digest-chemtool-1.5 64
-MD5 a3c19580612c87d845915088e7b2b17b files/src-cht-Makefile.in-chemtool-1.5-gentoo.diff 294
-MD5 7151e5d79c40abc9dadc9d84eee1f309 files/chemtool-1.6.patch 447
 MD5 56154dbfda6dca74e622eafa3eb88d36 files/digest-chemtool-1.6 64
-MD5 688b7e71b424ea48eb9cd4b67f227f5c chemtool-1.5.ebuild 1756
-MD5 cccbc68c4eee37ac01b3e03fd5d26e38 ChangeLog 955
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 9bcb4756cd4038dd75f9c0fcde8eecdd chemtool-1.6.ebuild 1952
+MD5 7151e5d79c40abc9dadc9d84eee1f309 files/chemtool-1.6.patch 447
+MD5 85997784eda14376edb5a380af598393 files/Makefile.in-chemtool-1.5-gentoo.diff 2715
+MD5 a3c19580612c87d845915088e7b2b17b files/src-cht-Makefile.in-chemtool-1.5-gentoo.diff 294
+MD5 55ee243e7331b078a204b1ad52ef4146 files/configure.in-chemtool-1.5-gentoo.diff 2069
diff --git a/app-sci/chemtool/chemtool-1.6.ebuild b/app-sci/chemtool/chemtool-1.6.ebuild
index b3d70021e487..8a33c07cb422 100644
--- a/app-sci/chemtool/chemtool-1.6.ebuild
+++ b/app-sci/chemtool/chemtool-1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-sci/chemtool/chemtool-1.6.ebuild,v 1.2 2003/08/05 18:31:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-sci/chemtool/chemtool-1.6.ebuild,v 1.3 2003/08/06 06:47:11 phosphan Exp $
 
 [ -n "`use kde`" ] && inherit kde-functions
 inherit eutils
@@ -19,7 +19,7 @@ DEPEND=">=media-gfx/transfig-3.2.3d
 	>=media-libs/libemf-1.0
 	sys-apps/supersed
 	gnome? ( gnome-base/gnome )
-	kde? ( kde-base/kde )
+	kde? ( kde-base/kdebase )
 	nls? ( sys-devel/gettext )"
 
 src_unpack() {
@@ -29,12 +29,14 @@ src_unpack() {
 }
 
 src_compile() {
+	local mykdedir="${KDEDIR}"
+	if [ -z "${mykdedir}" ]; then mykdedir="bogus_kde"; fi
 	local config_opts
 	config_opts="--enable-emf"
 
 	if [ "`use kde`" ]; then
 		need-kde 2
-		config_opts="${config_opts} --with-kdedir=${KDEDIR}" ;
+		config_opts="${config_opts} --with-kdedir=${mykdedir}" ;
 	else
 		config_opts="${config_opts} --without-kdedir"
 	fi
@@ -59,16 +61,20 @@ src_compile() {
 }
 
 src_install() {
-	dodir ${KDEDIR}/share/applnk/Graphics
-	dodir ${KDEDIR}/share/mimelnk/application
-	dodir ${KDEDIR}/share/icons/hicolor/32x32/mimetypes
+
+	local mykdedir="${KDEDIR}"
+	if [ -z "${mykdedir}" ]; then mykdedir="bogus_kde"; fi
+	local sharedirs="applnk/Graphics mimelnk/application icons/hicolor/32x32/mimetypes"
+	for dir in ${sharedirs}; do
+		dodir ${mykdedir}/share/${dir}
+    done
 	dodir /usr/share/mime-types
    	dodir /usr/share/pixmaps/mc
 
 	make DESTDIR="${D}" install || die "make install failed"
 
 	if ! use kde; then
-		rm -rf ${D}/${KDEDIR}
+			rm -rf ${D}/${mykdedir}
 	fi
 
 	if ! use gnome; then