Improving KDE detection, bug #105955

(Portage version: 2.0.51.22-r2)

4 files changed, 25 insertions, 38 deletions

diff --git a/sci-chemistry/chemtool/ChangeLog b/sci-chemistry/chemtool/ChangeLog
index 604ab865d00b..3093b6857e49 100644
--- a/sci-chemistry/chemtool/ChangeLog
+++ b/sci-chemistry/chemtool/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/chemtool
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/ChangeLog,v 1.6 2005/08/08 10:25:01 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/ChangeLog,v 1.7 2005/09/16 09:45:43 phosphan Exp $
+
+  16 Sep 2005; Patrick Kursawe <phosphan@gentoo.org> chemtool-1.6.6.ebuild,
+  chemtool-1.6.7.ebuild:
+  No longer relying on KDEDIR variable because of bug #105955 and getting rid of that
+  ugly bogus_kde hack I did before.
 
 *chemtool-1.6.7 (08 Aug 2005)
 
diff --git a/sci-chemistry/chemtool/Manifest b/sci-chemistry/chemtool/Manifest
index 15becdfa1b18..c987c326abb0 100644
--- a/sci-chemistry/chemtool/Manifest
+++ b/sci-chemistry/chemtool/Manifest
@@ -1,8 +1,8 @@
 MD5 372559212ea87a5bd27a53e6a03fa8ea chemtool-1.6.3.ebuild 1951
-MD5 14653e4e53f81b75f0ef19867fcb9f21 chemtool-1.6.7.ebuild 2078
+MD5 d41777b38ee687ca372d71d6214f4441 chemtool-1.6.7.ebuild 1962
 MD5 9e2101d05a406781b0e7edbd09b89e15 chemtool-1.6.4.ebuild 2073
-MD5 cb6408b571b0cb6ccf650d2f900f9e35 chemtool-1.6.6.ebuild 2077
-MD5 4abb897373e92e0fe4854b9c241cb55e ChangeLog 3252
+MD5 9ce1dc35ec99601ea9063ca4ad424607 chemtool-1.6.6.ebuild 1961
+MD5 9cf32e7f4be130417580e0911faa5ce0 ChangeLog 3451
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 4ae73ea952733fc1500a98a82b1b8f3d files/digest-chemtool-1.6.3 66
 MD5 73e6d16f503d84f586445148c62e1a32 files/digest-chemtool-1.6.4 66
diff --git a/sci-chemistry/chemtool/chemtool-1.6.6.ebuild b/sci-chemistry/chemtool/chemtool-1.6.6.ebuild
index e34d4fabadec..8931cbea977a 100644
--- a/sci-chemistry/chemtool/chemtool-1.6.6.ebuild
+++ b/sci-chemistry/chemtool/chemtool-1.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/chemtool-1.6.6.ebuild,v 1.3 2005/08/08 10:25:01 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/chemtool-1.6.6.ebuild,v 1.4 2005/09/16 09:45:43 phosphan Exp $
 
 inherit eutils kde-functions
 
@@ -18,19 +18,21 @@ DEPEND=">=media-gfx/transfig-3.2.3d
 			gtk2? ( =x11-libs/gtk+-2* )
 			=x11-libs/gtk+-1*
 			)
+		kde? ( kde-base/kdelibs )
 		x86? ( >=media-libs/libemf-1.0 )"
 
 src_compile() {
 	local config_opts
 	local mycppflags
-	local mykdedir
-	if [ -z "${KDEDIR}" ]; then
-		mykdedir="bogus_kde"
+	if ! use kde; then
+		unset KDEDIR
+		config_opts="${config_opts} --without-kdedir"
 	else
-		mykdedir="${KDEDIR}"
+		set-kdedir
+		config_opts="${config_opts} --with-kdedir=${KDEDIR}"
 	fi
 	if [ ${ARCH} = "x86"  ]; then
-		config_opts="--enable-emf"
+		config_opts="${config_opts} --enable-emf"
 		mycppflags="${mycppflags} -I /usr/include/libEMF"
 	fi
 
@@ -41,10 +43,6 @@ src_compile() {
 	sed -e "s:\(^CPPFLAGS.*\):\1 ${mycppflags}:" -i Makefile.in || \
 		die "could not append cppflags"
 
-	if use kde; then
-		config_opts="${config_opts} --with-kdedir=${mykdedir}" ;
-	fi
-
 	if use gnome ; then
 		config_opts="${config_opts} --with-gnomedir=/usr" ;
 	else
@@ -57,9 +55,6 @@ src_compile() {
 }
 
 src_install() {
-
-	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}
@@ -69,10 +64,6 @@ src_install() {
 
 	make DESTDIR="${D}" install || die "make install failed"
 
-	if ! use kde; then
-			rm -rf ${D}/${mykdedir}
-	fi
-
 	if ! use gnome; then
 		rm -rf ${D}/usr/share/pixmaps ${D}/usr/share/mime-types
 	fi
diff --git a/sci-chemistry/chemtool/chemtool-1.6.7.ebuild b/sci-chemistry/chemtool/chemtool-1.6.7.ebuild
index 05c4b788a1aa..191952ea68aa 100644
--- a/sci-chemistry/chemtool/chemtool-1.6.7.ebuild
+++ b/sci-chemistry/chemtool/chemtool-1.6.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/chemtool-1.6.7.ebuild,v 1.1 2005/08/08 10:25:01 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/chemtool/chemtool-1.6.7.ebuild,v 1.2 2005/09/16 09:45:43 phosphan Exp $
 
 inherit eutils kde-functions
 
@@ -18,19 +18,21 @@ DEPEND=">=media-gfx/transfig-3.2.3d
 			gtk2? ( =x11-libs/gtk+-2* )
 			=x11-libs/gtk+-1*
 			)
+		kde? ( kde-base/kdelibs )
 		x86? ( >=media-libs/libemf-1.0 )"
 
 src_compile() {
 	local config_opts
 	local mycppflags
-	local mykdedir
-	if [ -z "${KDEDIR}" ]; then
-		mykdedir="bogus_kde"
+	if ! use kde; then
+		unset KDEDIR
+		config_opts="${config_opts} --without-kdedir"
 	else
-		mykdedir="${KDEDIR}"
+		set-kdedir
+		config_opts="${config_opts} --with-kdedir=${KDEDIR}"
 	fi
 	if [ ${ARCH} = "x86"  ]; then
-		config_opts="--enable-emf"
+		config_opts="${config_opts} --enable-emf"
 		mycppflags="${mycppflags} -I /usr/include/libEMF"
 	fi
 
@@ -41,10 +43,6 @@ src_compile() {
 	sed -e "s:\(^CPPFLAGS.*\):\1 ${mycppflags}:" -i Makefile.in || \
 		die "could not append cppflags"
 
-	if use kde; then
-		config_opts="${config_opts} --with-kdedir=${mykdedir}" ;
-	fi
-
 	if use gnome ; then
 		config_opts="${config_opts} --with-gnomedir=/usr" ;
 	else
@@ -57,9 +55,6 @@ src_compile() {
 }
 
 src_install() {
-
-	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}
@@ -69,10 +64,6 @@ src_install() {
 
 	make DESTDIR="${D}" install || die "make install failed"
 
-	if ! use kde; then
-			rm -rf ${D}/${mykdedir}
-	fi
-
 	if ! use gnome; then
 		rm -rf ${D}/usr/share/pixmaps ${D}/usr/share/mime-types
 	fi