version bump

9 files changed, 24 insertions, 115 deletions

diff --git a/gnome-extra/gal/ChangeLog b/gnome-extra/gal/ChangeLog
index d9586f8f5c3c..204218b41d50 100644
--- a/gnome-extra/gal/ChangeLog
+++ b/gnome-extra/gal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gal
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/ChangeLog,v 1.45 2003/08/20 03:44:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/ChangeLog,v 1.46 2003/09/24 14:34:56 liquidx Exp $
+
+*gal-1.99.10 (24 Sep 2003)
+
+  24 Sep 2003; Alastair Tse <liquidx@gentoo.org> gal-0.23.ebuild,
+  gal-1.99.10.ebuild, gal-1.99.7.ebuild, gal-1.99.9.ebuild,
+  files/gal-1.99.3-docfix.patch:
+  version bump and cleanups
 
   19 Aug 2003; Aron Griffis <agriffis@gentoo.org> gal-0.24.ebuild:
   Make it build on alpha by faking out the linking of e-test-completion
diff --git a/gnome-extra/gal/Manifest b/gnome-extra/gal/Manifest
index fe95891b557f..31d3c1a34646 100644
--- a/gnome-extra/gal/Manifest
+++ b/gnome-extra/gal/Manifest
@@ -1,16 +1,11 @@
-MD5 9c1c5400e3a07f61af7a0fb982424920 ChangeLog 5621
-MD5 00d170bc67256f2fa2bda79e2243d833 gal-0.23.ebuild 1596
+MD5 eff9b93162d6deb4527a03561d24cc50 ChangeLog 5836
 MD5 55222517d3bb5450986c4250b861b16a gal-0.24.ebuild 2114
-MD5 bc2453b2b4cc19c39d26949673adf28e gal-1.99.10.ebuild 939
-MD5 6395c3f4940ab1914f509e5ee1bb3e93 gal-1.99.7.ebuild 1265
+MD5 79754fa431d4ad12540fb3c4e2bc148c gal-1.99.10.ebuild 930
 MD5 a91dc1e86d28703e425d9765ab11265f gal-1.99.8.ebuild 933
-MD5 bc2453b2b4cc19c39d26949673adf28e gal-1.99.9.ebuild 939
+MD5 9b7064be2fa31f6745748be9b545b531 gal-1.99.9.ebuild 928
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 86ce180c545e5973d1fea36e43143dca files/digest-gal-0.23 62
 MD5 78bec5aec485baac3fa825378fabb471 files/digest-gal-0.24 121
 MD5 cb565a4aa9136bd033e3f4986bf877ce files/digest-gal-1.99.10 64
-MD5 1ac519328da6233734867158e8c004fd files/digest-gal-1.99.7 63
 MD5 619c5b9f40e528247f8b57f6d3558b77 files/digest-gal-1.99.8 63
 MD5 0a9e5b8f36b8f9f4e73e8e29beb04b7d files/digest-gal-1.99.9 63
 MD5 b2f242d8b7015030276291e22e03aa48 files/gal-0.24-sgml-1.patch 1363
-MD5 4690f5246b395401f10fd9082b676912 files/gal-1.99.3-docfix.patch 436
diff --git a/gnome-extra/gal/files/digest-gal-0.23 b/gnome-extra/gal/files/digest-gal-0.23
deleted file mode 100644
index cbfa7cd3f94d..000000000000
--- a/gnome-extra/gal/files/digest-gal-0.23
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7afd78f2801029a413e0e1e0abba4af2 gal-0.23.tar.bz2 1032853
diff --git a/gnome-extra/gal/files/digest-gal-1.99.10 b/gnome-extra/gal/files/digest-gal-1.99.10
new file mode 100644
index 000000000000..de0e5ed15fb6
--- /dev/null
+++ b/gnome-extra/gal/files/digest-gal-1.99.10
@@ -0,0 +1 @@
+MD5 72284a1e174329cb42149ae327f43995 gal-1.99.10.tar.bz2 943975
diff --git a/gnome-extra/gal/files/digest-gal-1.99.7 b/gnome-extra/gal/files/digest-gal-1.99.7
deleted file mode 100644
index 42f334498d4a..000000000000
--- a/gnome-extra/gal/files/digest-gal-1.99.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 10cf22f030cb5cc69557473695d2e103 gal-1.99.7.tar.bz2 950615
diff --git a/gnome-extra/gal/files/gal-1.99.3-docfix.patch b/gnome-extra/gal/files/gal-1.99.3-docfix.patch
deleted file mode 100644
index 124873b0fbcf..000000000000
--- a/gnome-extra/gal/files/gal-1.99.3-docfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gal-1.99.3/docs/Makefile.in	2003-04-09 19:37:42.000000000 +0100
-+++ gal-1.99.3/docs/Makefile.in.new	2003-04-21 18:52:01.000000000 +0100
-@@ -365,8 +365,6 @@
- 	  done; \
- 	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
- 	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
--	  echo '-- Fixing Crossreferences' ; \
--	  gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)|| true; \
- 	fi)
- 
- dist-hook:
diff --git a/gnome-extra/gal/gal-0.23.ebuild b/gnome-extra/gal/gal-0.23.ebuild
deleted file mode 100644
index 70d9ad92fde5..000000000000
--- a/gnome-extra/gal/gal-0.23.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-0.23.ebuild,v 1.9 2003/09/08 05:13:41 msterret Exp $
-
-IUSE="nls doc"
-
-inherit gnome.org libtool
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="The Gnome Application Libraries"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~alpha"
-
-RDEPEND=">=dev-libs/libxml-1.8.16
-	>=gnome-base/gnome-print-0.34
-	=gnome-base/libglade-0*
-	=x11-libs/gtk+-1.2*
-	<gnome-base/gnome-vfs-1.9.0
-	>=dev-libs/libunicode-0.4-r1
-	media-libs/gdk-pixbuf"
-
-DEPEND="nls? ( sys-devel/gettext )
-	>=dev-util/intltool-0.11
-	dev-lang/perl
-	doc? ( dev-util/gtk-doc )
-	${RDEPEND}"
-
-
-src_compile() {
-	elibtoolize
-
-	local myconf=""
-	use nls || myconf="--disable-nls"
-
-	if [ -n "`use doc`" ]; then
-		myconf="${myconf} --enable-gtk-doc"
-	else
-		myconf="${myconf} --disable-gtk-doc"
-	fi
-
-	./configure --host=${CHOST}	\
-		    --prefix=/usr \
-		    --sysconfdir=/etc \
-		    --localstatedir=/var/lib \
-		     ${myconf} || die
-
-	make || die # Doesn't work with -j 4 (hallski)
-}
-
-src_install() {
-	make prefix=${D}/usr \
-	     sysconfdir=${D}/etc \
-	     localstatedir=${D}/var/lib	\
-	     install || die
-
-	# Add some type of backward compat...
-	local fullname="`eval basename \`readlink ${D}/usr/lib/libgal.so\``"
-	dosym ${fullname##*/} /usr/lib/libgal.so.$((`echo ${PV} | cut -d. -f2`-1))
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-}
-
-pkg_postinst() {
-	einfo "If you upgraded gal, you must emerge gtkhtml again to prevent breakage."
-}
diff --git a/gnome-extra/gal/gal-1.99.7.ebuild b/gnome-extra/gal/gal-1.99.10.ebuild
index 7408b3cc227e..641a15598ed2 100644
--- a/gnome-extra/gal/gal-1.99.7.ebuild
+++ b/gnome-extra/gal/gal-1.99.10.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-1.99.7.ebuild,v 1.7 2003/09/08 05:13:41 msterret Exp $
-
-IUSE="doc"
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-1.99.10.ebuild,v 1.1 2003/09/24 14:34:56 liquidx Exp $
 
 inherit gnome2 gnome.org libtool
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="The Gnome Application Libraries"
 HOMEPAGE="http://www.gnome.org/"
 
+IUSE="doc"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="x86 ~ppc ~sparc hppa"
+KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha"
 
 RDEPEND=">=gnome-base/libgnomeprint-2.2.0
 	>=gnome-base/libgnomeprintui-2.2.1
@@ -27,24 +25,15 @@ DEPEND="sys-devel/gettext
 	doc? ( dev-util/gtk-doc )
 	${RDEPEND}"
 
-MAKEOPTS="-j1"
+MAKEOPTS="${MAKEOPTS} -j1"
 USE_DESTDIR="1"
+ELTCONF="--reverse-deps"
 
 src_unpack() {
 	unpack ${A}
-	gnome2_omf_fix
 
-	# remove gtkdoc-fixxref
-	cd ${S}; patch -p1 < ${FILESDIR}/gal-1.99.3-docfix.patch
-}
-
-src_install() {
-	gnome2_src_install
+	gnome2_omf_fix
 
-	# HACK HACK HACK !!
-	# See libgtkhtml-3.x for more info. but basically this is here
-	# for exactly the same reason. We should NOT release this until
-	# we get those libtool problems fixed! However, this is the
-	# temporary workaround. - <liquidx@gentoo.org>
-	dosym /usr/lib/libgal-2.0.so.3 /usr/lib/libgal-2.0.so.2
+	# Remove gtkdoc-fixxref
+	cd ${S}; epatch ${FILESDIR}/gal-1.99.3-docfix.patch
 }
diff --git a/gnome-extra/gal/gal-1.99.9.ebuild b/gnome-extra/gal/gal-1.99.9.ebuild
index bdfca409a62f..95602694f848 100644
--- a/gnome-extra/gal/gal-1.99.9.ebuild
+++ b/gnome-extra/gal/gal-1.99.9.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-1.99.9.ebuild,v 1.4 2003/09/08 05:13:41 msterret Exp $
-
-IUSE="doc"
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-1.99.9.ebuild,v 1.5 2003/09/24 14:34:56 liquidx Exp $
 
 inherit gnome2 gnome.org libtool
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="The Gnome Application Libraries"
 HOMEPAGE="http://www.gnome.org/"
 
+IUSE="doc"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha"
+KEYWORDS="x86 ~ppc ~sparc ~hppa ~alpha"
 
 RDEPEND=">=gnome-base/libgnomeprint-2.2.0
 	>=gnome-base/libgnomeprintui-2.2.1
@@ -27,7 +25,7 @@ DEPEND="sys-devel/gettext
 	doc? ( dev-util/gtk-doc )
 	${RDEPEND}"
 
-MAKEOPTS="-j1"
+MAKEOPTS="${MAKEOPTS} -j1"
 USE_DESTDIR="1"
 ELTCONF="--reverse-deps"