version bump. another crack at fixing gal docs

9 files changed, 32 insertions, 110 deletions

diff --git a/gnome-extra/gal/ChangeLog b/gnome-extra/gal/ChangeLog
index 8855747f3b09..6613bcef31bc 100644
--- a/gnome-extra/gal/ChangeLog
+++ b/gnome-extra/gal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gal
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/ChangeLog,v 1.69 2004/09/17 11:11:26 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/ChangeLog,v 1.70 2004/10/01 10:14:20 liquidx Exp $
+
+*gal-2.2.2 (01 Oct 2004)
+
+  01 Oct 2004; Alastair Tse <liquidx@gentoo.org> -gal-2.1.13.ebuild,
+  -gal-2.1.14.ebuild, -gal-2.2.0.ebuild, +gal-2.2.2.ebuild:
+  version bump. another crack at fixing gal docs
 
 *gal-2.2.1 (17 Sep 2004)
 
diff --git a/gnome-extra/gal/Manifest b/gnome-extra/gal/Manifest
index 192936d72885..20d442895e90 100644
--- a/gnome-extra/gal/Manifest
+++ b/gnome-extra/gal/Manifest
@@ -1,18 +1,20 @@
-MD5 f0c027c1dd0d6a4df860694262818cab gal-2.1.14.ebuild 1045
+MD5 0c137312341468c045f5212fe9593474 ChangeLog 8300
+MD5 2b6e66b5a98de0c61a6f5e0030dd1037 gal-0.24.ebuild 2085
 MD5 ae45492535caad3aec2b6816de49b6d1 gal-1.99.11.ebuild 967
-MD5 75eddd69d60557711e79c22cebfae02d gal-2.2.1.ebuild 1162
 MD5 a7bcfd2cfaebd0d83ee22fd5cb85e875 gal-2.1.13.ebuild 1047
+MD5 f0c027c1dd0d6a4df860694262818cab gal-2.1.14.ebuild 1045
 MD5 aa5335e36a169e2bcd5f04e8335ceb4c gal-2.2.0.ebuild 1138
-MD5 2b6e66b5a98de0c61a6f5e0030dd1037 gal-0.24.ebuild 2085
-MD5 0c137312341468c045f5212fe9593474 ChangeLog 8300
+MD5 75eddd69d60557711e79c22cebfae02d gal-2.2.1.ebuild 1162
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 01d2e669030e9b8ec09ce8b4bd3537e4 gal-2.2.2.ebuild 1159
 MD5 78bec5aec485baac3fa825378fabb471 files/digest-gal-0.24 121
+MD5 95ab7cf92689f0cd2db97884cc53c423 files/digest-gal-1.99.11 64
 MD5 d8bae7d1f416770456393bd52068fa3c files/digest-gal-2.1.13 64
 MD5 01b9663c943fd682b86f7711a62abba9 files/digest-gal-2.1.14 64
+MD5 748a1263cc1b026299e1bcc4902d4e77 files/digest-gal-2.2.0 63
+MD5 12d1425c3d08b81b5b53cc8654141a0f files/digest-gal-2.2.1 63
 MD5 b2f242d8b7015030276291e22e03aa48 files/gal-0.24-sgml-1.patch 1363
-MD5 95ab7cf92689f0cd2db97884cc53c423 files/digest-gal-1.99.11 64
 MD5 4690f5246b395401f10fd9082b676912 files/gal-1.99.3-docfix.patch 436
-MD5 97951a1b0e70fcbb12ca490084442b33 files/gal-2.2.0-docfix.patch 2569
 MD5 737e4a75668a5590e54e746295c5efd7 files/gal-2.1.12-gcc34.patch 483
-MD5 748a1263cc1b026299e1bcc4902d4e77 files/digest-gal-2.2.0 63
-MD5 12d1425c3d08b81b5b53cc8654141a0f files/digest-gal-2.2.1 63
+MD5 97951a1b0e70fcbb12ca490084442b33 files/gal-2.2.0-docfix.patch 2569
+MD5 f912b63413502c12279194f0150e7987 files/digest-gal-2.2.2 63
diff --git a/gnome-extra/gal/files/digest-gal-2.1.13 b/gnome-extra/gal/files/digest-gal-2.1.13
deleted file mode 100644
index a3711032c895..000000000000
--- a/gnome-extra/gal/files/digest-gal-2.1.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c0af9a8e5ed86fc53377705256d30c5 gal-2.1.13.tar.bz2 1112602
diff --git a/gnome-extra/gal/files/digest-gal-2.1.14 b/gnome-extra/gal/files/digest-gal-2.1.14
deleted file mode 100644
index 31b2bdf547a4..000000000000
--- a/gnome-extra/gal/files/digest-gal-2.1.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fc2d5527220b406ef1540625a46d13ac gal-2.1.14.tar.bz2 1128975
diff --git a/gnome-extra/gal/files/digest-gal-2.2.0 b/gnome-extra/gal/files/digest-gal-2.2.0
deleted file mode 100644
index fb071222d68c..000000000000
--- a/gnome-extra/gal/files/digest-gal-2.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 34baf5bd0ee72a54ca3ee998ce48fb66 gal-2.2.0.tar.bz2 1135686
diff --git a/gnome-extra/gal/files/digest-gal-2.2.2 b/gnome-extra/gal/files/digest-gal-2.2.2
new file mode 100644
index 000000000000..e6cb5a4e45ee
--- /dev/null
+++ b/gnome-extra/gal/files/digest-gal-2.2.2
@@ -0,0 +1 @@
+MD5 204f9ef57c1b447dc13df9d78a5d5615 gal-2.2.2.tar.bz2 1161379
diff --git a/gnome-extra/gal/gal-2.1.13.ebuild b/gnome-extra/gal/gal-2.1.13.ebuild
deleted file mode 100644
index 79b5ba6df8ea..000000000000
--- a/gnome-extra/gal/gal-2.1.13.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-2.1.13.ebuild,v 1.1 2004/08/06 18:39:04 liquidx Exp $
-
-inherit gnome2 libtool debug eutils
-
-DESCRIPTION="The Gnome Application Libraries"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="2.2"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~amd64 ~mips"
-IUSE="doc"
-
-RDEPEND=">=x11-libs/gtk+-2.2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomecanvas-2
-	>=dev-libs/libxml2-2
-	app-text/scrollkeeper"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.30
-	doc? ( dev-util/gtk-doc )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-USE_DESTDIR="1"
-ELTCONF="--reverse-deps"
-G2CONF="--disable-gtk-doc"
-
-src_unpack() {
-	unpack ${A}
-
-	gnome2_omf_fix
-
-	# Remove gtkdoc-fixxref
-	cd ${S}
-	epatch ${FILESDIR}/gal-1.99.3-docfix.patch
-	epatch ${FILESDIR}/gal-2.1.12-gcc34.patch
-}
diff --git a/gnome-extra/gal/gal-2.2.0.ebuild b/gnome-extra/gal/gal-2.2.0.ebuild
deleted file mode 100644
index 1e25b9629d68..000000000000
--- a/gnome-extra/gal/gal-2.2.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-2.2.0.ebuild,v 1.1 2004/09/13 21:44:07 tseng Exp $
-
-inherit gnome2 libtool debug eutils
-
-DESCRIPTION="The Gnome Application Libraries"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="2.2"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~amd64 ~mips"
-IUSE="doc"
-
-RDEPEND=">=x11-libs/gtk+-2.2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2.1
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomecanvas-2
-	>=dev-libs/libxml2-2
-	app-text/scrollkeeper"
-
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.30
-	doc? ( dev-util/gtk-doc )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-USE_DESTDIR="1"
-ELTCONF="--reverse-deps"
-G2CONF="--disable-gtk-doc"
-
-src_unpack() {
-	unpack ${A}
-
-	gnome2_omf_fix
-
-	cd ${S}
-	#GCC 3.4 fix
-	epatch ${FILESDIR}/gal-2.1.12-gcc34.patch
-
-	#USE=doc build fix
-	epatch ${FILESDIR}/gal-2.2.0-docfix.patch
-	cd ${S}/docs
-	for x in gal*; do mv "$x" `echo $x | sed -e 's/gal/gal-2.2/g';`; done
-}
diff --git a/gnome-extra/gal/gal-2.1.14.ebuild b/gnome-extra/gal/gal-2.2.2.ebuild
index 81d32e97c159..d7960a468c51 100644
--- a/gnome-extra/gal/gal-2.1.14.ebuild
+++ b/gnome-extra/gal/gal-2.2.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-2.1.14.ebuild,v 1.1 2004/08/24 14:58:00 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-2.2.2.ebuild,v 1.1 2004/10/01 10:14:20 liquidx Exp $
 
-inherit gnome2 libtool debug eutils
+inherit gnome2 libtool eutils
 
 DESCRIPTION="The Gnome Application Libraries"
 HOMEPAGE="http://www.gnome.org/"
@@ -30,15 +30,23 @@ DEPEND="${RDEPEND}
 MAKEOPTS="${MAKEOPTS} -j1"
 USE_DESTDIR="1"
 ELTCONF="--reverse-deps"
-G2CONF="--disable-gtk-doc"
 
 src_unpack() {
-	unpack ${A}
 
+	unpack ${A}
 	gnome2_omf_fix
 
-	# Remove gtkdoc-fixxref
+	#GCC 3.4 fix
 	cd ${S}
-	epatch ${FILESDIR}/gal-1.99.3-docfix.patch
 	epatch ${FILESDIR}/gal-2.1.12-gcc34.patch
+
+	ln -s ${S}/docs/gal-decl.txt ${S}/docs/gal-2.2-decl.txt
+	ln -s ${S}/docs/gal-sections.txt ${S}/docs/gal-2.2-sections.txt
+
+	#USE=doc build fix
+	epatch ${FILESDIR}/gal-1.99.3-docfix.patch
+	#cd ${S}/docs
+	#for x in gal*; do mv "$x" `echo $x | sed -e 's/gal/gal-2.2/g';`; done
+	# FIXME : builds now, but docs aren't generated
+
 }