Improving KDE detection, bug #105955

Package-Manager: portage-2.0.51.22-r2

diff --git a/sci-chemistry/chemtool/ChangeLog b/sci-chemistry/chemtool/ChangeLog
index 604ab865d00b4ff14d478a70c1ce6065129c496d..3093b6857e493a23b681c9713e5a540d853534be 100644 (file)
--- 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 15becdfa1b1833be9d978c87279a85718678b918..57a96c530aad158d2c12dee70aeb199355852c6c 100644 (file)
--- 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 7d10c746ffc8cb3e6c1b3b1ce883f52c 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 fbbb209c3e2234f852270a8bad2a38bc chemtool-1.6.6.ebuild 1961
+MD5 4d73c5a706d910245432ef277ba5c114 ChangeLog 3476
 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 e34d4fabadecf1acc5dc767e55cea40c6162972c..8931cbea977aacdcf65e099c8ef76d0ce332b367 100644 (file)
--- 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 05c4b788a1aa03e33b99d3f6c6e105b3d07abf2a..191952ea68aa492f6a708da252b4a9f26d006709 100644 (file)
--- 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