New version: 2.4.3. Removing obsolete ebuilds/patches.

(Portage version: 2.0.51.22-r1)

9 files changed, 20 insertions, 217 deletions

diff --git a/gnome-extra/gal/ChangeLog b/gnome-extra/gal/ChangeLog
index 82e3d28c96d4..c60337c4223d 100644
--- a/gnome-extra/gal/ChangeLog
+++ b/gnome-extra/gal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/gal
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/ChangeLog,v 1.100 2005/06/23 08:45:16 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/ChangeLog,v 1.101 2005/07/08 03:07:04 leonardop Exp $
+
+*gal-2.4.3 (07 Jul 2005)
+
+  07 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> gal-2.4.3.ebuild:
+  New version. Added 'static' USE flag. Updated dependencies.
 
   23 Jun 2005; Guy Martin <gmsoft@gentoo.org> gal-2.4.1.ebuild:
   Stable on hppa.
diff --git a/gnome-extra/gal/files/digest-gal-2.2.2 b/gnome-extra/gal/files/digest-gal-2.2.2
deleted file mode 100644
index e6cb5a4e45ee..000000000000
--- a/gnome-extra/gal/files/digest-gal-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 204f9ef57c1b447dc13df9d78a5d5615 gal-2.2.2.tar.bz2 1161379
diff --git a/gnome-extra/gal/files/digest-gal-2.2.3 b/gnome-extra/gal/files/digest-gal-2.2.3
deleted file mode 100644
index 956c6be4b75d..000000000000
--- a/gnome-extra/gal/files/digest-gal-2.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a50985fd1b70dc05cfc921455c39e660 gal-2.2.3.tar.bz2 1161166
diff --git a/gnome-extra/gal/files/digest-gal-2.4.0 b/gnome-extra/gal/files/digest-gal-2.4.0
deleted file mode 100644
index 1203a859ba40..000000000000
--- a/gnome-extra/gal/files/digest-gal-2.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ce94075fa92400328ff02d7b8f3c7f3a gal-2.4.0.tar.bz2 1195949
diff --git a/gnome-extra/gal/files/digest-gal-2.4.3 b/gnome-extra/gal/files/digest-gal-2.4.3
new file mode 100644
index 000000000000..f223bfcea901
--- /dev/null
+++ b/gnome-extra/gal/files/digest-gal-2.4.3
@@ -0,0 +1 @@
+MD5 de9ef290fd614a1057e26e31bc294142 gal-2.4.3.tar.bz2 1056344
diff --git a/gnome-extra/gal/files/gal-2.2.0-docfix.patch b/gnome-extra/gal/files/gal-2.2.0-docfix.patch
deleted file mode 100644
index 7cec6737aeef..000000000000
--- a/gnome-extra/gal/files/gal-2.2.0-docfix.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- 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.2.ebuild b/gnome-extra/gal/gal-2.2.2.ebuild
deleted file mode 100644
index d40f26ebdc9b..000000000000
--- a/gnome-extra/gal/gal-2.2.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-2.2.2.ebuild,v 1.3 2005/01/09 11:12:49 slarti Exp $
-
-inherit gnome2 libtool eutils
-
-DESCRIPTION="The Gnome Application Libraries"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="2.2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-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"
-
-src_unpack() {
-
-	unpack ${A}
-	gnome2_omf_fix
-
-	#GCC 3.4 fix
-	cd ${S}
-	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
-
-}
diff --git a/gnome-extra/gal/gal-2.2.3.ebuild b/gnome-extra/gal/gal-2.2.3.ebuild
deleted file mode 100644
index 76e3d80b3a48..000000000000
--- a/gnome-extra/gal/gal-2.2.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-2.2.3.ebuild,v 1.10 2005/01/20 00:00:11 vapier Exp $
-
-inherit gnome2 libtool eutils
-
-DESCRIPTION="The Gnome Application Libraries"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="2.2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc sparc x86"
-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.2.0.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"
-
-src_unpack() {
-
-	unpack ${A}
-	gnome2_omf_fix
-
-	#GCC 3.4 fix
-	cd ${S}
-	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
-
-}
diff --git a/gnome-extra/gal/gal-2.4.0.ebuild b/gnome-extra/gal/gal-2.4.3.ebuild
index 9bfcc446ab60..7a9906e86e97 100644
--- a/gnome-extra/gal/gal-2.4.0.ebuild
+++ b/gnome-extra/gal/gal-2.4.3.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-2.4.0.ebuild,v 1.2 2005/03/09 16:44:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-2.4.3.ebuild,v 1.1 2005/07/08 03:07:04 leonardop Exp $
 
-inherit gnome2 libtool eutils
+inherit libtool eutils gnome2
 
 DESCRIPTION="The Gnome Application Libraries"
 HOMEPAGE="http://www.gnome.org/"
 
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="LGPL-2"
 SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE="doc"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static"
 
 RDEPEND=">=x11-libs/gtk+-2.2
 	>=gnome-base/libgnomeprint-2.2
@@ -18,19 +18,21 @@ RDEPEND=">=x11-libs/gtk+-2.2
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnomeui-2
 	>=gnome-base/libgnomecanvas-2.2.0.2
-	>=dev-libs/libxml2-2
-	app-text/scrollkeeper"
+	>=dev-libs/libxml2-2"
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	dev-util/pkgconfig
-	>=dev-util/intltool-0.30
-	doc? ( dev-util/gtk-doc )"
+	>=dev-util/intltool-0.27.1
+	doc? ( >=dev-util/gtk-doc-1 )"
 
 MAKEOPTS="${MAKEOPTS} -j1"
 USE_DESTDIR="1"
 ELTCONF="--reverse-deps"
 
+DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+G2CONF="${G2CONF} $(use_enable static)"
+
 src_unpack() {
 
 	unpack ${A}
@@ -38,12 +40,12 @@ src_unpack() {
 
 	#GCC 3.4 fix
 	cd ${S}
-	epatch ${FILESDIR}/gal-2.1.12-gcc34.patch
+	epatch ${FILESDIR}/${PN}-2.1.12-gcc34.patch
 
 	ln -s ${S}/docs/gal-decl.txt ${S}/docs/gal-2.4-decl.txt
 	ln -s ${S}/docs/gal-sections.txt ${S}/docs/gal-2.4-sections.txt
 
 	#USE=doc build fix
-	epatch ${FILESDIR}/gal-1.99.3-docfix.patch
+	epatch ${FILESDIR}/${PN}-1.99.3-docfix.patch
 
 }