version bump.

5 files changed, 163 insertions, 7 deletions

diff --git a/gnome-extra/gal/ChangeLog b/gnome-extra/gal/ChangeLog
index ce7c59c21987..28da21e94841 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.67 2004/08/24 14:58:00 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/ChangeLog,v 1.68 2004/09/13 21:44:07 tseng Exp $
+
+*gal-2.2.0 (13 Sep 2004)
+
+  13 Sep 2004; Brandon Hale <tseng@gentoo.org> +gal-2.2.0.ebuild:
+    - Version bump, closes bug #62583. 
+    - Include a build fix when USE=doc from Joe McCann on bug #61591.
 
 *gal-2.1.14 (24 Aug 2004)
 
diff --git a/gnome-extra/gal/Manifest b/gnome-extra/gal/Manifest
index e611727ff978..134a1594f962 100644
--- a/gnome-extra/gal/Manifest
+++ b/gnome-extra/gal/Manifest
@@ -1,13 +1,16 @@
-MD5 a7bcfd2cfaebd0d83ee22fd5cb85e875 gal-2.1.13.ebuild 1047
+MD5 e931db442db20a53e46ef4b9b4005a40 ChangeLog 7991
 MD5 2b6e66b5a98de0c61a6f5e0030dd1037 gal-0.24.ebuild 2085
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 ae45492535caad3aec2b6816de49b6d1 gal-1.99.11.ebuild 967
-MD5 e931db442db20a53e46ef4b9b4005a40 ChangeLog 7991
+MD5 a7bcfd2cfaebd0d83ee22fd5cb85e875 gal-2.1.13.ebuild 1047
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 f0c027c1dd0d6a4df860694262818cab gal-2.1.14.ebuild 1045
+MD5 a22bf7d8198e2c1c4260704712619715 gal-2.2.0.ebuild 1139
+MD5 748a1263cc1b026299e1bcc4902d4e77 files/digest-gal-2.2.0 63
 MD5 78bec5aec485baac3fa825378fabb471 files/digest-gal-0.24 121
-MD5 d8bae7d1f416770456393bd52068fa3c files/digest-gal-2.1.13 64
 MD5 95ab7cf92689f0cd2db97884cc53c423 files/digest-gal-1.99.11 64
+MD5 d8bae7d1f416770456393bd52068fa3c files/digest-gal-2.1.13 64
+MD5 b2f242d8b7015030276291e22e03aa48 files/gal-0.24-sgml-1.patch 1363
+MD5 4690f5246b395401f10fd9082b676912 files/gal-1.99.3-docfix.patch 436
 MD5 737e4a75668a5590e54e746295c5efd7 files/gal-2.1.12-gcc34.patch 483
 MD5 01b9663c943fd682b86f7711a62abba9 files/digest-gal-2.1.14 64
-MD5 4690f5246b395401f10fd9082b676912 files/gal-1.99.3-docfix.patch 436
-MD5 b2f242d8b7015030276291e22e03aa48 files/gal-0.24-sgml-1.patch 1363
+MD5 97951a1b0e70fcbb12ca490084442b33 files/gal-2.2.0-docfix.patch 2569
diff --git a/gnome-extra/gal/files/digest-gal-2.2.0 b/gnome-extra/gal/files/digest-gal-2.2.0
new file mode 100644
index 000000000000..fb071222d68c
--- /dev/null
+++ b/gnome-extra/gal/files/digest-gal-2.2.0
@@ -0,0 +1 @@
+MD5 34baf5bd0ee72a54ca3ee998ce48fb66 gal-2.2.0.tar.bz2 1135686
diff --git a/gnome-extra/gal/files/gal-2.2.0-docfix.patch b/gnome-extra/gal/files/gal-2.2.0-docfix.patch
new file mode 100644
index 000000000000..7cec6737aeef
--- /dev/null
+++ b/gnome-extra/gal/files/gal-2.2.0-docfix.patch
@@ -0,0 +1,98 @@
+--- docs/Makefile.am.orig	2004-08-25 19:40:39.835722184 -0500
++++ docs/Makefile.am	2004-08-25 19:49:07.564535672 -0500
+@@ -1,6 +1,6 @@
+ DOC_MODULE = $(GETTEXT_PACKAGE)
+ 
+-DOC_MAIN_SGML_FILE=gal-api.sgml
++DOC_MAIN_SGML_FILE=$(DOC_MODULE)-api.sgml
+ 
+ DOC_SOURCE_DIR=$(top_srcdir)/gal
+ 
+@@ -14,26 +14,26 @@
+ gal_docdir = $(TARGET_DIR)
+ 
+ gal_doc_DATA =			\
+-	gal-api.sgml		\
+-	gal-api.html		\
+-	gal.hierarchy		\
+-	gal.signals		\
+-	gal.types		\
+-	gal-decl.txt		\
+-	gal-sections.txt
++	$(DOC_MODULE)-api.sgml		\
++	$(DOC_MODULE)-api.html		\
++	$(DOC_MODULE).hierarchy		\
++	$(DOC_MODULE).signals		\
++	$(DOC_MODULE).types		\
++	$(DOC_MODULE)-decl.txt		\
++	$(DOC_MODULE)-sections.txt
+ 
+ if ENABLE_GTK_DOC
+-gal-api.html: html/book1.html
+-	-cp $(srcdir)/html/book1.html $(srcdir)/gal-api.html
++$(DOC_MODULE)-api.html: html/book1.html
++	-cp $(srcdir)/html/book1.html $(srcdir)/$(DOC_MODULE)-api.html
+ else
+ gal-api.html:
+ 	touch $(srcdir)/gal-api.html
+ endif
+ 
+-html/book1.html: sgml/gal-api-doc.bottom
++html/book1.html: sgml/$(DOC_MODULE)-doc.bottom
+ 	$(MAKE) html
+ 
+-sgml/gal-api-doc.bottom: $(tmpl_sources)
++sgml/$(DOC_MODULE)-api-doc.bottom: $(tmpl_sources)
+ 	$(MAKE) sgml
+ 
+ scan:
+--- docs/Makefile.in.orig	2004-08-13 09:01:38.000000000 -0500
++++ docs/Makefile.in	2004-08-25 19:53:16.467696640 -0500
+@@ -161,13 +161,13 @@
+ gal_docdir = $(TARGET_DIR)
+ 
+ gal_doc_DATA = \
+-	gal-api.sgml		\
+-	gal-api.html		\
+-	gal.hierarchy		\
+-	gal.signals		\
+-	gal.types		\
+-	gal-decl.txt		\
+-	gal-sections.txt
++	$(DOC_MODULE)-api.sgml		\
++	$(DOC_MODULE)-api.html		\
++	$(DOC_MODULE).hierarchy		\
++	$(DOC_MODULE).signals		\
++	$(DOC_MODULE).types		\
++	$(DOC_MODULE)-decl.txt		\
++	$(DOC_MODULE)-sections.txt
+ 
+ 
+ EXTRA_DIST = $(gal_doc_DATA)
+@@ -328,14 +328,14 @@
+ 
+ 
+ @ENABLE_GTK_DOC_TRUE@gal-api.html: html/book1.html
+-@ENABLE_GTK_DOC_TRUE@	-cp $(srcdir)/html/book1.html $(srcdir)/gal-api.html
++@ENABLE_GTK_DOC_TRUE@	-cp $(srcdir)/html/book1.html $(srcdir)/$(DOC_MODULE)-api.html
+ @ENABLE_GTK_DOC_FALSE@gal-api.html:
+ @ENABLE_GTK_DOC_FALSE@	touch $(srcdir)/gal-api.html
+ 
+-html/book1.html: sgml/gal-api-doc.bottom
++html/book1.html: sgml/$(DOC_MODULE)-api-doc.bottom
+ 	$(MAKE) html
+ 
+-sgml/gal-api-doc.bottom: $(tmpl_sources)
++sgml/$(DOC_MODULE)-api-doc.bottom: $(tmpl_sources)
+ 	$(MAKE) sgml
+ 
+ scan:
+@@ -374,8 +374,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-2.2.0.ebuild b/gnome-extra/gal/gal-2.2.0.ebuild
new file mode 100644
index 000000000000..1e25b9629d68
--- /dev/null
+++ b/gnome-extra/gal/gal-2.2.0.ebuild
@@ -0,0 +1,48 @@
+# 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
+}