Mass Update: gnustep.eclass revamped to allow configurable root install; gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions bumped where files would change); some KEYWORDS were accidentally dropped between version bumps of packages -- this has been resolved; windowmaker correctly supports gnustep now; gnustep-funcs.eclass added -- used where info on an installed gnustep-env is needed rather than making a full GNUstep application

9 files changed, 29 insertions, 134 deletions

diff --git a/gnustep-apps/gnumail/ChangeLog b/gnustep-apps/gnumail/ChangeLog
index 0a3a9059caa4..3e18534c6c49 100644
--- a/gnustep-apps/gnumail/ChangeLog
+++ b/gnustep-apps/gnumail/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnustep-apps/gnumail
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/ChangeLog,v 1.8 2004/10/31 17:09:16 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/ChangeLog,v 1.9 2004/11/12 03:52:49 fafhrd Exp $
+
+*gnumail-1.2.0_pre20041108 (11 Nov 2004)
+
+  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org> -gnumail-1.1.0.ebuild,
+  -gnumail-1.2.0_pre20040916.ebuild, -gnumail-1.2.0_pre20040927.ebuild,
+  gnumail-1.2.0_pre20041030.ebuild, +gnumail-1.2.0_pre20041108.ebuild:
+  Mass Update: gnustep.eclass revamped to allow configurable root install;
+  gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions
+  bumped where files would change); some KEYWORDS were accidentally dropped
+  between version bumps of packages -- this has been resolved; windowmaker
+  correctly supports gnustep now
 
 *gnumail-1.2.0_pre20041030 (31 Oct 2004)
 
diff --git a/gnustep-apps/gnumail/Manifest b/gnustep-apps/gnumail/Manifest
index 53965c6590bc..7b47d58ed870 100644
--- a/gnustep-apps/gnumail/Manifest
+++ b/gnustep-apps/gnumail/Manifest
@@ -1,10 +1,6 @@
-MD5 ef6bdf6c0d8aed84cf5642d241b91638 ChangeLog 2581
-MD5 f017bae9db7c408766832ae0ab99f298 gnumail-1.1.0.ebuild 1118
-MD5 43a49ca587685082a81a7968640998cd gnumail-1.2.0_pre20040916.ebuild 1412
-MD5 79feb2939106d2ea09b24e8b4dda0bd1 gnumail-1.2.0_pre20040927.ebuild 1659
+MD5 9d6c0cb7e7ef188925c7b369aae01f43 gnumail-1.2.0_pre20041030.ebuild 1654
+MD5 82b34786b44f7731306931f2023e8ac2 gnumail-1.2.0_pre20041108.ebuild 1575
+MD5 7e621eac0a01e4f849ddeae6793a0f62 ChangeLog 3180
 MD5 fd2a74704d1454dc7972123fded408cb metadata.xml 620
-MD5 fb52b5fb63a95f5216db1f81de06b80d gnumail-1.2.0_pre20041030.ebuild 1661
-MD5 a6afb5fd55515a881cc64e0b5f2667d9 files/digest-gnumail-1.1.0 66
-MD5 f36a821d49eb1f2777e387ce18f224ba files/digest-gnumail-1.2.0_pre20040916 78
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnumail-1.2.0_pre20040927 0
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnumail-1.2.0_pre20041030 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnumail-1.2.0_pre20041108 0
diff --git a/gnustep-apps/gnumail/files/digest-gnumail-1.1.0 b/gnustep-apps/gnumail/files/digest-gnumail-1.1.0
deleted file mode 100644
index 81a08ea226a1..000000000000
--- a/gnustep-apps/gnumail/files/digest-gnumail-1.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8b9d1030849dbc91c2d28716c6fceef2 GNUMail-1.1.0.tar.gz 1002575
diff --git a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20040916 b/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20040916
deleted file mode 100644
index 6bec5a19c07f..000000000000
--- a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20040916
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ddca3b5011d36201e3cb029c2a012a72 GNUMail-1.2.0_pre20040916.tar.gz 1171847
diff --git a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20040927 b/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20041108
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20040927
+++ b/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre20041108
diff --git a/gnustep-apps/gnumail/gnumail-1.1.0.ebuild b/gnustep-apps/gnumail/gnumail-1.1.0.ebuild
deleted file mode 100644
index b3326997f481..000000000000
--- a/gnustep-apps/gnumail/gnumail-1.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.1.0.ebuild,v 1.2 2004/07/23 15:47:22 fafhrd Exp $
-
-inherit gnustep-old
-
-IUSE="crypt xface"
-S=${WORKDIR}/GNUMail
-
-newdepend gnustep-base/gnustep-gui
-newdepend gnustep-libs/pantomime
-
-DESCRIPTION="A fully featured mail application for GNUstep"
-HOMEPAGE="http://www.collaboration-world.com/gnumail/"
-SRC_URI="http://www.collaboration-world.com/gnumail.data/releases/Stable/GNUMail-${PV}.tar.gz"
-
-DEPEND="${DEPEND}"
-RDEPEND="${RDEPEND} gnustep-base/gnustep-back"
-
-KEYWORDS="x86 ~ppc alpha"
-LICENSE="GPL-2"
-SLOT="0"
-
-src_unpack() {
-	unpack GNUMail-${PV}.tar.gz
-	cd ${S}
-}
-
-src_compile() {
-	egnustepmake
-
-	if use xface; then
-		cd ${S}/Bundles/Face
-		make
-		cd ${S}
-	fi
-
-	if use crypt; then
-		cd ${S}/Bundles/PGP
-		make
-		cd ${S}
-	fi
-}
-
-src_install() {
-	egnustepinstall
-
-	use xface && cp -a ${S}/Bundles/Face/Face.bundle ${D}usr/GNUstep/System/Library/GNUMail/
-
-	use crypt && cp -a ${S}/Bundles/PGP/PGP.bundle ${D}usr/GNUstep/System/Library/GNUMail/
-}
diff --git a/gnustep-apps/gnumail/gnumail-1.2.0_pre20040916.ebuild b/gnustep-apps/gnumail/gnumail-1.2.0_pre20040916.ebuild
deleted file mode 100644
index ce7d6b58988e..000000000000
--- a/gnustep-apps/gnumail/gnumail-1.2.0_pre20040916.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.2.0_pre20040916.ebuild,v 1.3 2004/10/21 19:08:12 fafhrd Exp $
-
-inherit gnustep
-
-S=${WORKDIR}/${PN/gnum/GNUM}
-
-DESCRIPTION="A fully featured mail application for GNUstep"
-HOMEPAGE="http://www.collaboration-world.com/gnumail/"
-SRC_URI="mirror://gentoo/${P/gnum/GNUM}.tar.gz"
-KEYWORDS="~x86 ~ppc"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="${IUSE} xface crypt emoticon"
-DEPEND="${GS_DEPEND}
-	gnustep-libs/pantomime
-	gnustep-apps/addresses"
-RDEPEND="${GS_RDEPEND}
-	crypt? app-crypt/gnupg
-	gnustep-libs/pantomime
-	gnustep-apps/addresses"
-
-src_compile() {
-	egnustep_env
-	egnustep_make
-
-	if use xface ; then
-		cd Bundles/Face
-		egnustep_make
-		cd ../..
-	fi
-
-	if use crypt ; then
-		cd Bundles/PGP
-		egnustep_make
-		cd ../..
-	fi
-
-	if use emoticon ; then
-		cd Bundles/Emoticon
-		egnustep_make
-		cd ../..
-	fi
-}
-
-src_install() {
-	egnustep_env
-	egnustep_install
-	if use doc ; then
-		egnustep_env
-		egnustep_doc || die
-	fi
-
-	use xface && cp -a ${S}/Bundles/Face/Face.bundle ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/GNUMail/
-	use crypt && cp -a ${S}/Bundles/PGP/PGP.bundle ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/GNUMail/
-	use emoticon && cp -a ${S}/Bundles/Emoticon/Emoticon.bundle ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/GNUMail/
-
-	egnustep_package_config
-}
diff --git a/gnustep-apps/gnumail/gnumail-1.2.0_pre20041030.ebuild b/gnustep-apps/gnumail/gnumail-1.2.0_pre20041030.ebuild
index b78aec56eeeb..43eff0a8c7ac 100644
--- a/gnustep-apps/gnumail/gnumail-1.2.0_pre20041030.ebuild
+++ b/gnustep-apps/gnumail/gnumail-1.2.0_pre20041030.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.2.0_pre20041030.ebuild,v 1.1 2004/10/31 17:09:16 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.2.0_pre20041030.ebuild,v 1.2 2004/11/12 03:52:49 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="Sophos.ca:/opt/cvsroot"
@@ -18,7 +18,7 @@ S=${WORKDIR}/${ECVS_MODULE}
 DESCRIPTION="A fully featured mail application for GNUstep"
 HOMEPAGE="http://www.collaboration-world.com/gnumail/"
 
-KEYWORDS="~ppc"
+KEYWORDS="~x86 ~ppc"
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -62,9 +62,9 @@ src_install() {
 		egnustep_doc || die
 	fi
 
-	use xface && cp -a ${S}/Bundles/Face/Face.bundle ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/GNUMail/
-	use crypt && cp -a ${S}/Bundles/PGP/PGP.bundle ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/GNUMail/
-	use emoticon && cp -a ${S}/Bundles/Emoticon/Emoticon.bundle ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/GNUMail/
+	use xface && cp -a ${S}/Bundles/Face/Face.bundle ${D}$(egnustep_prefix)/System/Library/GNUMail/
+	use crypt && cp -a ${S}/Bundles/PGP/PGP.bundle ${D}$(egnustep_prefix)/System/Library/GNUMail/
+	use emoticon && cp -a ${S}/Bundles/Emoticon/Emoticon.bundle ${D}$(egnustep_prefix)/System/Library/GNUMail/
 
 	egnustep_package_config
 }
diff --git a/gnustep-apps/gnumail/gnumail-1.2.0_pre20040927.ebuild b/gnustep-apps/gnumail/gnumail-1.2.0_pre20041108.ebuild
index 9640fb7a5eda..7f3473b594d3 100644
--- a/gnustep-apps/gnumail/gnumail-1.2.0_pre20040927.ebuild
+++ b/gnustep-apps/gnumail/gnumail-1.2.0_pre20041108.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.2.0_pre20040927.ebuild,v 1.4 2004/10/21 19:08:12 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.2.0_pre20041108.ebuild,v 1.1 2004/11/12 03:52:49 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="Sophos.ca:/opt/cvsroot"
@@ -8,8 +8,8 @@ ECVS_USER="anoncvs"
 ECVS_PASS="anoncvs"
 ECVS_AUTH="pserver"
 ECVS_MODULE="${PN/gnum/GNUM}"
-ECVS_CO_OPTS="-D ${PV/*_pre}"
-ECVS_UP_OPTS="-D ${PV/*_pre}"
+ECVS_CO_OPTS="-P -D ${PV/*_pre}"
+ECVS_UP_OPTS="-dP -D ${PV/*_pre}"
 ECVS_TOP_DIR="${DISTDIR}/cvs-src/Sophos.ca-collaborationworld"
 inherit gnustep cvs
 
@@ -31,6 +31,8 @@ RDEPEND="${GS_RDEPEND}
 	=gnustep-libs/pantomime-${PV}
 	gnustep-apps/addresses"
 
+egnustep_install_domain "Local"
+
 src_compile() {
 	egnustep_env
 	egnustep_make
@@ -62,9 +64,9 @@ src_install() {
 		egnustep_doc || die
 	fi
 
-	use xface && cp -a ${S}/Bundles/Face/Face.bundle ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/GNUMail/
-	use crypt && cp -a ${S}/Bundles/PGP/PGP.bundle ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/GNUMail/
-	use emoticon && cp -a ${S}/Bundles/Emoticon/Emoticon.bundle ${D}${GENTOO_GNUSTEP_ROOT}/System/Library/GNUMail/
+	use xface && cp -a ${S}/Bundles/Face/Face.bundle ${D}$(egnustep_install_domain)/Library/GNUMail/
+	use crypt && cp -a ${S}/Bundles/PGP/PGP.bundle ${D}$(egnustep_install_domain)/Library/GNUMail/
+	use emoticon && cp -a ${S}/Bundles/Emoticon/Emoticon.bundle ${D}$(egnustep_install_domain)/Library/GNUMail/
 
 	egnustep_package_config
 }