ebuild updates for GNUstep base, libs, and apps across the board; proper versions (to be stabilized, in due time) added where apropos, cvs-pull versions updated where needed

(Portage version: 2.0.51.19)

7 files changed, 36 insertions, 55 deletions

diff --git a/gnustep-base/gnustep-back-xlib/ChangeLog b/gnustep-base/gnustep-back-xlib/ChangeLog
index 849afabb69c5..f6d064942f08 100644
--- a/gnustep-base/gnustep-back-xlib/ChangeLog
+++ b/gnustep-base/gnustep-back-xlib/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnustep-base/gnustep-back-xlib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/ChangeLog,v 1.12 2005/01/10 16:23:15 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/ChangeLog,v 1.13 2005/03/17 20:55:08 fafhrd Exp $
+
+*gnustep-back-xlib-0.9.5_pre20050312 (17 Mar 2005)
+
+  17 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/font-make-fix.patch-0.9.5_pre20050312,
+  -gnustep-back-xlib-0.9.5_pre20041203.ebuild,
+  -gnustep-back-xlib-0.9.5_pre20050106.ebuild,
+  +gnustep-back-xlib-0.9.5_pre20050312.ebuild:
+  ebuild updates for GNUstep base, libs, and apps across the board; proper
+  versions (to be stabilized, in due time) added where apropos, cvs-pull
+  versions updated where needed
 
 *gnustep-back-xlib-0.9.5_pre20050106 (10 Jan 2005)
 
diff --git a/gnustep-base/gnustep-back-xlib/Manifest b/gnustep-base/gnustep-back-xlib/Manifest
index b09d13724f60..8fc098ebe06c 100644
--- a/gnustep-base/gnustep-back-xlib/Manifest
+++ b/gnustep-base/gnustep-back-xlib/Manifest
@@ -1,9 +1,8 @@
-MD5 9fd8da560009a11bd153f8a87bfe8219 gnustep-back-xlib-0.9.5_pre20050106.ebuild 1250
-MD5 c6ec14987937ebe2b39bde8fd7dd3508 gnustep-back-xlib-0.9.5_pre20041203.ebuild 1250
-MD5 da93923431441b659098180464e6f996 gnustep-back-xlib-0.9.4.ebuild 1044
 MD5 fab2165da115acddd806d207e07f95d0 ChangeLog 2977
 MD5 ef356714ab02a84c6e88fe3720749aea metadata.xml 1022
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-back-xlib-0.9.5_pre20041203 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-back-xlib-0.9.5_pre20050106 0
-MD5 9c943c0c0837bfe718a98769bc25d366 files/digest-gnustep-back-xlib-0.9.4 70
+MD5 5f2833c7c77395d7700d355e79a0973d gnustep-back-xlib-0.9.5_pre20050312.ebuild 1231
+MD5 da93923431441b659098180464e6f996 gnustep-back-xlib-0.9.4.ebuild 1044
 MD5 14c86d6ff5e83af36ad3d54266af5c99 files/config-gnustep-back-xlib.sh 181
+MD5 f9dd4c1b68af4bef2e272d82202323ea files/font-make-fix.patch-0.9.5_pre20050312 501
+MD5 9c943c0c0837bfe718a98769bc25d366 files/digest-gnustep-back-xlib-0.9.4 70
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-back-xlib-0.9.5_pre20050312 0
diff --git a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20050106 b/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20050106
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20050106
+++ /dev/null
diff --git a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20041203 b/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20050312
index e69de29bb2d1..e69de29bb2d1 100644
--- a/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20041203
+++ b/gnustep-base/gnustep-back-xlib/files/digest-gnustep-back-xlib-0.9.5_pre20050312
diff --git a/gnustep-base/gnustep-back-xlib/files/font-make-fix.patch-0.9.5_pre20050312 b/gnustep-base/gnustep-back-xlib/files/font-make-fix.patch-0.9.5_pre20050312
new file mode 100644
index 000000000000..5554a8b712a7
--- /dev/null
+++ b/gnustep-base/gnustep-back-xlib/files/font-make-fix.patch-0.9.5_pre20050312
@@ -0,0 +1,12 @@
+diff -ur Fonts/GNUmakefile Fonts/GNUmakefile
+--- Fonts/GNUmakefile	2005-03-12 23:06:51.808553304 -0500
++++ Fonts/GNUmakefile	2005-02-22 22:47:34.000000000 -0500
+@@ -27,7 +27,7 @@
+ include $(GNUSTEP_MAKEFILES)/common.make
+ 
+ #RESOURCE_SET_NAME = back-resources
+-back-resources_RESOURCE_FILES_INSTALL_DIR = Library/Fonts
++back-resources_RESOURCE_FILES_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/Fonts
+ back-resources_RESOURCE_FILES = $(FONT_INSTALL_FILES)
+ 
+ FONT_INSTALL_FILES = Helvetica.nfont
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20050106.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20050106.ebuild
deleted file mode 100644
index 100fbf863f0b..000000000000
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20050106.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20050106.ebuild,v 1.1 2005/01/10 16:23:15 fafhrd Exp $
-
-ECVS_CVS_COMMAND="cvs -q"
-ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
-ECVS_USER="anoncvs"
-ECVS_AUTH="ext"
-ECVS_MODULE="gnustep/core/back"
-ECVS_CO_OPTS="-P -D ${PV/*_pre}"
-ECVS_UP_OPTS="-dP -D ${PV/*_pre}"
-ECVS_TOP_DIR="${DISTDIR}/cvs-src/savannah.gnu.org-gnustep"
-inherit gnustep cvs
-
-S=${WORKDIR}/${ECVS_MODULE}
-
-DESCRIPTION="Default X11 back-end component for the GNUstep GUI Library."
-HOMEPAGE="http://www.gnustep.org"
-
-KEYWORDS="~x86 ~ppc ~sparc"
-SLOT="0"
-LICENSE="LGPL-2.1"
-
-PROVIDE="virtual/gnustep-back"
-
-IUSE="${IUSE} opengl xim doc"
-DEPEND="${GNUSTEP_GUI_DEPEND}
-	=gnustep-base/gnustep-gui-${PV}*
-	virtual/xft
-	opengl? ( virtual/opengl virtual/glu )"
-RDEPEND="${DEPEND}
-	${DOC_RDEPEND}"
-
-egnustep_install_domain "System"
-
-src_compile() {
-	egnustep_env
-
-	use opengl && myconf="--enable-glx"
-	myconf="$myconf `use_enable xim`"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=xlib --with-name=xlib"
-	econf $myconf || die "configure failed"
-
-	egnustep_make
-}
-
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20041203.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20050312.ebuild
index 3ad0784f3dd7..0200d6557935 100644
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20041203.ebuild
+++ b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20050312.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/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20041203.ebuild,v 1.2 2005/01/10 16:23:15 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.9.5_pre20050312.ebuild,v 1.1 2005/03/17 20:55:08 fafhrd Exp $
 
 ECVS_CVS_COMMAND="cvs -q"
 ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
@@ -33,6 +33,12 @@ RDEPEND="${DEPEND}
 
 egnustep_install_domain "System"
 
+src_unpack() {
+	cvs_src_unpack ${A}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/font-make-fix.patch-${PV}
+	cd ${S}
+}
+
 src_compile() {
 	egnustep_env