reorder eclass inherits to prevent kde overriding gnome2_src_install

7 files changed, 14 insertions, 369 deletions

diff --git a/net-mail/evolution/ChangeLog b/net-mail/evolution/ChangeLog
index fdf3aa65d57b..e8b6b4408a50 100644
--- a/net-mail/evolution/ChangeLog
+++ b/net-mail/evolution/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/evolution
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.88 2004/01/14 17:33:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.89 2004/02/07 07:15:28 liquidx Exp $
+
+  07 Feb 2004; Alastair Tse <liquidx@gentoo.org> evolution-1.4.3.ebuild,
+  evolution-1.4.4.ebuild, evolution-1.4.5.ebuild:
+  reorder eclass inherits to prevent kde overriding gnome2_src_install
 
   14 Jan 2004; Aron Griffis <agriffis@gentoo.org> evolution-1.4.5.ebuild:
   stable on alpha
diff --git a/net-mail/evolution/Manifest b/net-mail/evolution/Manifest
index 703b7f326dbd..b79b31de0b2b 100644
--- a/net-mail/evolution/Manifest
+++ b/net-mail/evolution/Manifest
@@ -1,17 +1,13 @@
-MD5 71b83f3eaef80be405f5d1aab7d1930e ChangeLog 14334
-MD5 670a44fae2657971b6ad20a4a6c4e11b evolution-1.4.4.ebuild 5355
+MD5 e7174a1235ebc33dd63795d4be8244a2 ChangeLog 14528
+MD5 23df33d6b22c462f267c44c1b1d9eea4 evolution-1.2.3.ebuild 5916
 MD5 8cbd6785d4eca6ad34ce38cf714fcf5c evolution-1.2.4.ebuild 6385
-MD5 02e191fac9428198cbfb736916ea33d3 evolution-1.4.5.ebuild 5479
+MD5 738c73544f93db082a40ae54aa76e12f evolution-1.4.5.ebuild 5558
 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
-MD5 23df33d6b22c462f267c44c1b1d9eea4 evolution-1.2.3.ebuild 5916
-MD5 b356540f443f116b5004130c3c3945cd evolution-1.4.3.ebuild 4794
+MD5 f17beebbd2d9ff5d49f48352be1b359c files/digest-evolution-1.2.3 131
+MD5 3137288dd17e357d0972dab00e4f6b6d files/digest-evolution-1.2.4 1230
 MD5 49463c08f32ee1df0970196b6c4cef2b files/digest-evolution-1.4.5 132
-MD5 d1cfb9ff73d996333d728b93087e2a7a files/digest-evolution-1.4.3 132
-MD5 832931a5d78d8cb1509639674340409e files/digest-evolution-1.4.4 132
-MD5 a3a0071b78894fc80b10a0ec765647f5 files/evolution-1.4.4-alpha.patch 1799
 MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
 MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
 MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
+MD5 a3a0071b78894fc80b10a0ec765647f5 files/evolution-1.4.4-alpha.patch 1799
 MD5 980771bb5349699c8d8ecd6b6f035b50 files/gnome-pilot.m4 6452
-MD5 f17beebbd2d9ff5d49f48352be1b359c files/digest-evolution-1.2.3 131
-MD5 3137288dd17e357d0972dab00e4f6b6d files/digest-evolution-1.2.4 1230
diff --git a/net-mail/evolution/evolution-1.4.3.ebuild b/net-mail/evolution/evolution-1.4.3.ebuild
deleted file mode 100644
index 350247fc1b51..000000000000
--- a/net-mail/evolution/evolution-1.4.3.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.4.3.ebuild,v 1.8 2003/10/22 12:55:39 liquidx Exp $
-
-IUSE="ssl mozilla ldap doc spell pda ipv6 kerberos kde"
-
-inherit flag-o-matic virtualx gnome2
-use kde && inherit kde
-
-DB3="db-3.1.17"
-S="${WORKDIR}/${P}"
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-SRC_URI="${SRC_URI} http://www.sleepycat.com/update/snapshot/${DB3}.tar.gz"
-HOMEPAGE="http://www.ximian.com"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc hppa"
-
-# top stanza are ximian deps
-RDEPEND=">=gnome-extra/libgtkhtml-3.0.7
-	>=gnome-extra/gal-1.99.8
-	>=net-libs/libsoup-1.99.23
-	pda?     ( >=app-pda/gnome-pilot-2.0.9
-		>=app-pda/pilot-link-0.11.7
-		>=app-pda/gnome-pilot-conduits-2.0.9 )
-	spell?   ( >=app-text/gnome-spell-1.0.4 )
-
-	>=gnome-base/ORBit2-2.6.0
-	>=gnome-base/libbonoboui-2.0
-	>=gnome-base/gnome-vfs-2.0
-	>=gnome-base/libgnomeui-2.0
-	>=gnome-base/libglade-2.0
-	>=gnome-base/libgnome-2.0
-	>=dev-libs/libxml2-2.5
-	>=gnome-base/gconf-2.0
-	>=gnome-base/libgnomecanvas-2.2.0.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=gnome-base/libgnomeprint-2.2
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	ssl? ( mozilla? ( || ( ( >=dev-libs/nspr-4.3 >=dev-libs/nss-3.8 )
-			net-www/mozilla
-			)
-		) )
-	ssl? ( !mozilla? ( >=dev-libs/openssl-0.9.5 ) )
-	ldap?    ( >=net-nds/openldap-2.0 )
-	kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
-	doc?	 ( >=app-text/scrollkeeper-0.3.10-r1 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-util/pkgconfig
-	>=sys-devel/libtool-1.4.1-r1
-	>=dev-util/intltool-0.20
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )"
-
-pkg_setup() {
-	if [ -x ${ROOT}/usr/bin/evolution-1.3 ]; then
-		eerror "Please un-merge the 1.3 Development Versions of Ximian Evolution."
-		eerror "You can do this by doing:"
-		eerror ""
-		eerror "   emerge -C \"=net-mail/evolution-1.3*\""
-		eerror ""
-		die "unmerge evolution-1.3 before installing evolution-1.4"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	# remove dependency on libdb1.so (its deprecated)
-	cd ${S}; sed -i -e "s/-ldb1//" configure
-
-	# we need the omf fix, or else we get access violation
-	# errors related to sandbox
-	gnome2_omf_fix ${S}/help/C/Makefile.in
-}
-
-##### compile evolution specific db3 for static linking #####
-src_compile_db3() {
-	einfo "Compiling DB3..."
-	cd ${WORKDIR}/${DB3}/build_unix
-	../dist/configure --prefix=${WORKDIR}/db3 || die
-
-	# Rather ugly hack to make sure pthread mutex support are not enabled ...
-	if [ -n "`egrep "^LIBS=[[:space:]]*-lpthread" Makefile`" ];  then
-		append-flags "-pthread"
-	fi
-
-	make || die "db make failed"
-	make prefix=${WORKDIR}/db3 install || die "db install failed"
-
-}
-
-src_compile() {
-	elibtoolize
-
-	if [ "${ARCH}" = "hppa" ]; then
-		append-flags "-fPIC -ffunction-sections"
-		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
-	fi
-
-	# compile evo specific version of db3
-	src_compile_db3
-
-	einfo "Compiling Evolution..."
-	cd ${S}
-
-	local myconf=""
-
-	use pda \
-		&& myconf="${myconf} --with-pisock=/usr --enable-pilot-conduits=yes" \
-		|| myconf="${myconf} --enable-pilot-conduits=no"
-
-	use ldap \
-		&&	myconf="${myconf} --with-openldap=yes --with-static-ldap=no" \
-		|| myconf="${myconf} --with-openldap=no"
-
-	use kerberos \
-		&& myconf="${myconf} --with-krb5=/usr" \
-		|| myconf="${myconf} --without-krb5"
-
-	use doc \
-		&& myconf="${myconf} --enable-gtk-doc" \
-		|| myconf="${myconf} --disable-gtk-doc"
-
-	use ipv6 \
-		&& myconf="${myconf} --enable-ipv6=yes" \
-		|| myconf="${myconf} --enable-ipv6=no"
-
-	use kde && [ -n "${KDEDIR}" ] \
-		&& myconf="${myconf} --with-kde-applnk-path=${KDEDIR}/share/applnk"
-
-	# Use Mozilla NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE
-	if [ -n "`use ssl`" -a -n "`use mozilla`" ] ; then
-		if has_version "dev-libs/nspr"; then
-			NSS_LIB=/usr/lib
-			NSS_INC=/usr/include
-		elif has_version "net-www/mozilla"; then
-			NSS_LIB=/usr/lib/mozilla
-			NSS_INC=/usr/lib/mozilla/include
-		else
-			eerror "Neither net-www/mozilla nor dev-libs/nspr found."
-			die "unexpected error. unable to find nss/nspr"
-		fi
-
-		myconf="${myconf} --enable-nss=yes \
-			--with-nspr-includes=${NSS_INC}/nspr \
-			--with-nspr-libs=${NSS_LIB} \
-			--with-nss-includes=${NSS_INC}/nss \
-			--with-nss-libs=${NSS_LIB}"
-	else
-		myconf="${myconf} --without-nspr-libs --without-nspr-includes \
-			--without-nss-libs --without-nss-includes"
-	fi
-
-	# Else use OpenSSL if 'mozilla' not in USE  ...
-	if [ -n "`use ssl`" -a -z "`use mozilla`" ] ; then
-		myconf="${myconf} --enable-openssl=yes"
-	fi
-
-	econf --with-db3=${WORKDIR}/db3 ${myconf} || die
-
-	#needs to be able to connect to X display to build.
-	Xemake || Xmake || die "make failed"
-}
-
-USE_DESTDIR="1"
-DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
diff --git a/net-mail/evolution/evolution-1.4.4.ebuild b/net-mail/evolution/evolution-1.4.4.ebuild
deleted file mode 100644
index 697ff169ac05..000000000000
--- a/net-mail/evolution/evolution-1.4.4.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.4.4.ebuild,v 1.11 2003/10/22 12:55:39 liquidx Exp $
-
-IUSE="ssl mozilla ldap doc spell pda ipv6 kerberos kde crypt"
-
-inherit flag-o-matic virtualx gnome2
-use kde && inherit kde
-
-DB3="db-3.1.17"
-S="${WORKDIR}/${P}"
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-SRC_URI="${SRC_URI} http://www.sleepycat.com/update/snapshot/${DB3}.tar.gz"
-HOMEPAGE="http://www.ximian.com"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~hppa ~alpha"
-
-# Top stanza are ximian deps
-RDEPEND=">=gnome-extra/libgtkhtml-3.0.8
-	>=gnome-extra/gal-1.99.9
-	>=net-libs/libsoup-1.99.23
-	>=gnome-extra/yelp-2.2
-	pda? ( >=app-pda/gnome-pilot-2.0.9
-	       >=app-pda/pilot-link-0.11.7
-	       >=app-pda/gnome-pilot-conduits-2.0.9 )
-	spell? ( >=app-text/gnome-spell-1.0.4 )
-	>=gnome-base/ORBit2-2.6.0
-	>=gnome-base/libbonoboui-2.0
-	>=gnome-base/gnome-vfs-2.0
-	>=gnome-base/libgnomeui-2.0
-	>=gnome-base/libglade-2.0
-	>=gnome-base/libgnome-2.0
-	>=dev-libs/libxml2-2.5
-	>=gnome-base/gconf-2.0
-	>=gnome-base/libgnomecanvas-2.2.0.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=gnome-base/libgnomeprint-2.2
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
-	ssl? ( mozilla? ( || ( ( >=dev-libs/nspr-4.3 >=dev-libs/nss-3.8 )
-	                       net-www/mozilla
-	                     )
-	                ) )
-	ssl? ( !mozilla? ( >=dev-libs/openssl-0.9.5 ) )
-	ldap? ( >=net-nds/openldap-2.0 )
-	kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
-	doc? ( >=app-text/scrollkeeper-0.3.10-r1 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-util/pkgconfig
-	>=sys-devel/libtool-1.4.1-r1
-	>=dev-util/intltool-0.20
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )"
-
-pkg_setup() {
-	if [ -x ${ROOT}/usr/bin/evolution-1.3 ]; then
-		eerror "Please un-merge the 1.3 Development Versions of Ximian Evolution."
-		eerror "You can do this by doing:"
-		eerror ""
-		eerror "   emerge -C \"=net-mail/evolution-1.3*\""
-		eerror ""
-		die "unmerge evolution-1.3 before installing evolution-1.4"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Remove dependency on libdb1.so (its deprecated)
-	cd ${S}; sed -i -e "s/-ldb1//" configure
-
-	# We need the omf fix, or else we get access violation
-	# errors related to sandbox
-	gnome2_omf_fix ${S}/help/C/Makefile.in
-
-	# Patches for 64-bit
-	if use alpha; then
-		epatch ${FILESDIR}/evolution-1.4.4-alpha.patch || die "epatch failed"
-	fi
-}
-
-##### Compile evolution specific db3 for static linking #####
-src_compile_db3() {
-	einfo "Compiling DB3..."
-	cd ${WORKDIR}/${DB3}/build_unix
-	../dist/configure --prefix=${WORKDIR}/db3 || die
-
-	# Rather ugly hack to make sure pthread mutex support are not enabled ...
-	if [ -n "`egrep "^LIBS=[[:space:]]*-lpthread" Makefile`" ];  then
-		append-flags "-pthread"
-	fi
-
-	make || die "db make failed"
-	make prefix=${WORKDIR}/db3 install || die "db install failed"
-
-}
-
-src_compile() {
-	elibtoolize
-
-	if [ "${ARCH}" = "hppa" ]; then
-		append-flags "-fPIC -ffunction-sections"
-		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
-	fi
-
-	# Compile evo specific version of db3
-	src_compile_db3
-
-	einfo "Compiling Evolution..."
-	cd ${S}
-
-	local myconf=
-
-	use pda \
-		&& myconf="${myconf} --with-pisock=/usr --enable-pilot-conduits=yes" \
-		|| myconf="${myconf} --enable-pilot-conduits=no"
-
-	use ldap \
-		&&	myconf="${myconf} --with-openldap=yes --with-static-ldap=no" \
-		|| myconf="${myconf} --with-openldap=no"
-
-	use kerberos \
-		&& myconf="${myconf} --with-krb5=/usr" \
-		|| myconf="${myconf} --without-krb5"
-
-	use doc \
-		&& myconf="${myconf} --enable-gtk-doc" \
-		|| myconf="${myconf} --disable-gtk-doc"
-
-	use ipv6 \
-		&& myconf="${myconf} --enable-ipv6=yes" \
-		|| myconf="${myconf} --enable-ipv6=no"
-
-	use kde && [ -n "${KDEDIR}" ] \
-		&& myconf="${myconf} --with-kde-applnk-path=${KDEDIR}/share/applnk"
-
-	# Use Mozilla NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE
-	if [ -n "`use ssl`" -a -n "`use mozilla`" ] ; then
-		if has_version "dev-libs/nspr"; then
-			NSS_LIB=/usr/lib
-			NSS_INC=/usr/include
-		elif has_version "net-www/mozilla"; then
-			NSS_LIB=/usr/lib/mozilla
-			NSS_INC=/usr/lib/mozilla/include
-		else
-			eerror "Neither net-www/mozilla nor dev-libs/nspr found."
-			die "unexpected error. unable to find nss/nspr"
-		fi
-
-		myconf="${myconf} --enable-nss=yes \
-			--with-nspr-includes=${NSS_INC}/nspr \
-			--with-nspr-libs=${NSS_LIB} \
-			--with-nss-includes=${NSS_INC}/nss \
-			--with-nss-libs=${NSS_LIB}"
-	else
-		myconf="${myconf} --without-nspr-libs --without-nspr-includes \
-			--without-nss-libs --without-nss-includes"
-	fi
-
-	# Else use OpenSSL if 'mozilla' not in USE  ...
-	if [ -n "`use ssl`" -a -z "`use mozilla`" ] ; then
-		myconf="${myconf} --enable-openssl=yes"
-	fi
-
-	econf --with-db3=${WORKDIR}/db3 ${myconf} || die
-
-	# Needs to be able to connect to X display to build.
-	Xemake || Xmake || die "make failed"
-}
-
-pkg_postinst() {
-	einfo "To change the default browser if you are not using GNOME, do:"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
-	einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	einfo ""
-	einfo "Replace 'mozilla %s' with which ever browser you use."
-}
-
-USE_DESTDIR="1"
-DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
diff --git a/net-mail/evolution/evolution-1.4.5.ebuild b/net-mail/evolution/evolution-1.4.5.ebuild
index 7aa1d31f6b54..1bc3fc7edfc9 100644
--- a/net-mail/evolution/evolution-1.4.5.ebuild
+++ b/net-mail/evolution/evolution-1.4.5.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.4.5.ebuild,v 1.11 2004/01/14 17:33:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.4.5.ebuild,v 1.12 2004/02/07 07:15:28 liquidx Exp $
 
-inherit flag-o-matic virtualx gnome2
+# kde before gnome2, otherwise kde_src_install will override gnome2_src_install
 use kde && inherit kde
+inherit flag-o-matic virtualx gnome2
 
 # problems with -O3 on gcc-3.3.1
 replace-flags -O3 -O2
diff --git a/net-mail/evolution/files/digest-evolution-1.4.3 b/net-mail/evolution/files/digest-evolution-1.4.3
deleted file mode 100644
index 58f56647f6fc..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.4.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 4cfed9d2f6a5a7ae71caa8f68494a15a evolution-1.4.3.tar.bz2 13178102
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/digest-evolution-1.4.4 b/net-mail/evolution/files/digest-evolution-1.4.4
deleted file mode 100644
index 14d101374cf3..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.4.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5a109e2b17f2b69d36526057412e9c52 evolution-1.4.4.tar.bz2 13418712
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117