giflib fixes; bug #85720

(Portage version: 2.0.51.19)

7 files changed, 127 insertions, 1 deletions

diff --git a/gnustep-base/gnustep-gui/ChangeLog b/gnustep-base/gnustep-gui/ChangeLog
index 928933f3a5d0..6253aba1b285 100644
--- a/gnustep-base/gnustep-gui/ChangeLog
+++ b/gnustep-base/gnustep-gui/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnustep-base/gnustep-gui
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/ChangeLog,v 1.25 2005/03/17 20:53:20 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/ChangeLog,v 1.26 2005/03/19 23:19:34 fafhrd Exp $
+
+*gnustep-gui-0.9.4-r2 (19 Mar 2005)
+
+  19 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org>
+  +files/gui-use-giflib.patch.bz2, +gnustep-gui-0.9.4-r2.ebuild,
+  +gnustep-gui-0.9.5_pre20050312-r1.ebuild:
+  giflib fixes; bug #85720
 
 *gnustep-gui-0.9.5_pre20050312 (17 Mar 2005)
 
diff --git a/gnustep-base/gnustep-gui/Manifest b/gnustep-base/gnustep-gui/Manifest
index 6585675062dd..4ab24e659b14 100644
--- a/gnustep-base/gnustep-gui/Manifest
+++ b/gnustep-base/gnustep-gui/Manifest
@@ -3,9 +3,14 @@ MD5 c350e41ce6bd8d971b0b9400707aedbd gnustep-gui-0.9.4.ebuild 1392
 MD5 649db105cbe2e9ffcca068143f88926f metadata.xml 1355
 MD5 41121d765735950991921796f34e7dda gnustep-gui-0.9.5_pre20050312.ebuild 1639
 MD5 e618ce7d8aa0b80e4aee50cbaca94a00 gnustep-gui-0.9.4-r1.ebuild 1553
+MD5 a4dde9d25a08f21c821dcac547723000 gnustep-gui-0.9.4-r2.ebuild 1521
+MD5 8f5cfeefce0629c3be374dc6ab949ad4 gnustep-gui-0.9.5_pre20050312-r1.ebuild 1646
 MD5 6f66904f0ad8d980c653d5c0fdf7d81b files/gnustep-gui-0.9.4-camaelon.patch 4029
 MD5 c6c9275a80b7fc7af0686d0875489069 files/digest-gnustep-gui-0.9.4 70
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-gui-0.9.5_pre20050312 0
 MD5 7bb8ef207dff05d7e80122fcffdcce88 files/gui-def.patch 640
 MD5 de8a4d2ff2308aaa042177ee1bcec78b files/gui-gsspell.patch 650
 MD5 c6c9275a80b7fc7af0686d0875489069 files/digest-gnustep-gui-0.9.4-r1 70
+MD5 c6c9275a80b7fc7af0686d0875489069 files/digest-gnustep-gui-0.9.4-r2 70
+MD5 a25aeac9ea3688989059cc6eb7edd207 files/gui-use-giflib.patch.bz2 3037
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-gnustep-gui-0.9.5_pre20050312-r1 0
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.4-r2 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.4-r2
new file mode 100644
index 000000000000..84f55556e03b
--- /dev/null
+++ b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.4-r2
@@ -0,0 +1 @@
+MD5 399b3a2341899d12710f4d1ed36f3002 gnustep-gui-0.9.4.tar.gz 1839593
diff --git a/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20050312-r1 b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20050312-r1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/gnustep-base/gnustep-gui/files/digest-gnustep-gui-0.9.5_pre20050312-r1
diff --git a/gnustep-base/gnustep-gui/files/gui-use-giflib.patch.bz2 b/gnustep-base/gnustep-gui/files/gui-use-giflib.patch.bz2
new file mode 100644
index 000000000000..a5ea63f60976
--- /dev/null
+++ b/gnustep-base/gnustep-gui/files/gui-use-giflib.patch.bz2
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.9.4-r2.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.9.4-r2.ebuild
new file mode 100644
index 000000000000..6f574e22a75a
--- /dev/null
+++ b/gnustep-base/gnustep-gui/gnustep-gui-0.9.4-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.9.4-r2.ebuild,v 1.1 2005/03/19 23:19:34 fafhrd Exp $
+
+inherit gnustep
+
+DESCRIPTION="It is a library of graphical user interface classes written completely in the Objective-C language."
+HOMEPAGE="http://www.gnustep.org"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
+
+KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
+SLOT="0"
+LICENSE="LGPL-2.1"
+
+IUSE="${IUSE} jpeg gif png gsnd doc cups"
+DEPEND="${GNUSTEP_BASE_DEPEND}
+	~gnustep-base/gnustep-base-1.10.1
+	virtual/x11
+	>=media-libs/tiff-3*
+	jpeg? ( >=media-libs/jpeg-6b* )
+	gif? ( >=media-libs/giflib-4.1* )
+	png? ( >=media-libs/libpng-1.2* )
+	gsnd? ( >=media-libs/audiofile-0.2* )
+	cups? ( >=net-print/cups-1.1* )
+	app-text/aspell"
+RDEPEND="${DEPEND}
+	${DOC_RDEPEND}"
+
+egnustep_install_domain "System"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/gui-def.patch
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/gui-gsspell.patch
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/gui-use-giflib.patch.bz2
+}
+
+src_compile() {
+	egnustep_env
+
+	myconf="--with-tiff-include=/usr/include --with-tiff-library=/usr/lib"
+	myconf="$myconf `use_enable gsnd`"
+	use gsnd && myconf="$myconf --with-audiofile-include=/usr/include --with-audiofile-lib=/usr/lib"
+	use gif && myconf="$myconf --disable-ungif --enable-giflib"
+	myconf="$myconf `use_enable jpeg`"
+	myconf="$myconf `use_enable png`"
+	myconf="$myconf `use_enable cups`"
+	econf $myconf || die "configure failed"
+
+	egnustep_make || die
+}
+
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20050312-r1.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20050312-r1.ebuild
new file mode 100644
index 000000000000..fc15a1593111
--- /dev/null
+++ b/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20050312-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-gui/gnustep-gui-0.9.5_pre20050312-r1.ebuild,v 1.1 2005/03/19 23:19:34 fafhrd Exp $
+
+ECVS_CVS_COMMAND="cvs -q"
+ECVS_SERVER="savannah.gnu.org:/cvsroot/gnustep"
+ECVS_USER="anoncvs"
+ECVS_AUTH="ext"
+ECVS_MODULE="gnustep/core/gui"
+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="It is a library of graphical user interface classes written completely in the Objective-C language."
+HOMEPAGE="http://www.gnustep.org"
+
+KEYWORDS="~ppc ~x86 ~amd64 ~sparc ~alpha"
+SLOT="0"
+LICENSE="LGPL-2.1"
+
+IUSE="${IUSE} jpeg gif png gsnd doc cups"
+DEPEND="${GNUSTEP_BASE_DEPEND}
+	>=gnustep-base/gnustep-base-1.10.2_pre20050312*
+	virtual/x11
+	>=media-libs/tiff-3*
+	jpeg? >=media-libs/jpeg-6b*
+	gif? >=media-libs/giflib-4.1*
+	png? >=media-libs/libpng-1.2*
+	gsnd? >=media-libs/audiofile-0.2*
+	cups? >=net-print/cups-1.1*
+	app-text/aspell"
+RDEPEND="${DEPEND}
+	${DOC_RDEPEND}"
+
+egnustep_install_domain "System"
+
+src_unpack() {
+	cvs_src_unpack ${A}
+	cd ${S}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/gui-use-giflib.patch.bz2
+}
+
+src_compile() {
+	egnustep_env
+
+	myconf="--with-tiff-include=/usr/include --with-tiff-library=/usr/lib"
+	myconf="$myconf `use_enable gsnd`"
+	use gsnd && myconf="$myconf --with-audiofile-include=/usr/include --with-audiofile-lib=/usr/lib"
+	use gif && myconf="$myconf --disable-ungif --enable-giflib"
+	myconf="$myconf `use_enable jpeg`"
+	myconf="$myconf `use_enable png`"
+	myconf="$myconf `use_enable cups`"
+	econf $myconf || die "configure failed"
+
+	egnustep_make || die
+}
+