Bump to 2.6.4. Code cleanup and build fixes for single includes.

(Portage version: 2.2_rc25/cvs/Linux x86_64)

4 files changed, 69 insertions, 9 deletions

diff --git a/gnome-base/libglade/ChangeLog b/gnome-base/libglade/ChangeLog
index 60c341187829..c75b7af0f688 100644
--- a/gnome-base/libglade/ChangeLog
+++ b/gnome-base/libglade/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/libglade
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v 1.122 2009/01/05 23:38:31 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v 1.123 2009/03/18 23:59:37 eva Exp $
+
+*libglade-2.6.4 (18 Mar 2009)
+
+  18 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  files/Makefile.in.am-2.4.2-xmlcatalog.patch,
+  files/libglade-2.6.3-fix_tests-page_size.patch, +libglade-2.6.4.ebuild:
+  Bump to 2.6.4. Code cleanup and build fixes for single includes.
 
   05 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
   -libglade-2.6.1.ebuild, -libglade-2.6.2.ebuild:
diff --git a/gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch b/gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch
index 4cf6a0170c2e..059cdc20f794 100644
--- a/gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch
+++ b/gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch
@@ -1,6 +1,5 @@
-diff -ur libglade-2.4.1/Makefile.am libglade-2.4.1-patched/Makefile.am
---- libglade-2.4.1/Makefile.am	2004-11-11 18:56:13.000000000 +0800
-+++ libglade-2.4.1-patched/Makefile.am	2004-12-06 11:00:24.501734048 +0800
+--- a/Makefile.am	2004-11-11 18:56:13.000000000 +0800
++++ b/Makefile.am	2004-12-06 11:00:24.501734048 +0800
 @@ -24,7 +24,7 @@
  
  if HAVE_XMLCATALOG
@@ -10,9 +9,8 @@ diff -ur libglade-2.4.1/Makefile.am libglade-2.4.1-patched/Makefile.am
  uninstall-local:
  	-$(XMLCATALOG) --noout --del $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE)
  endif
-diff -ur libglade-2.4.1/Makefile.in libglade-2.4.1-patched/Makefile.in
---- libglade-2.4.1/Makefile.in	2004-11-11 19:21:38.000000000 +0800
-+++ libglade-2.4.1-patched/Makefile.in	2004-12-06 11:00:49.786890120 +0800
+--- a/Makefile.in	2004-11-11 19:21:38.000000000 +0800
++++ b/Makefile.in	2004-12-06 11:00:49.786890120 +0800
 @@ -819,7 +819,7 @@
  
  
diff --git a/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch b/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch
index c26ff83d9c15..37c5b69e544c 100644
--- a/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch
+++ b/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch
@@ -1,5 +1,5 @@
---- tests/test-libglade-gtk.glade.orig	2008-09-27 16:50:40.164242312 +0300
-+++ tests/test-libglade-gtk.glade	2008-09-27 16:50:43.460908927 +0300
+--- a/tests/test-libglade-gtk.glade	2008-09-27 16:50:40.164242312 +0300
++++ b/tests/test-libglade-gtk.glade	2008-09-27 16:50:43.460908927 +0300
 @@ -470,7 +470,7 @@
  	  <upper>100</upper>
  	  <step>1</step>
diff --git a/gnome-base/libglade/libglade-2.6.4.ebuild b/gnome-base/libglade/libglade-2.6.4.ebuild
new file mode 100644
index 000000000000..a3487fed8f8a
--- /dev/null
+++ b/gnome-base/libglade/libglade-2.6.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.6.4.ebuild,v 1.1 2009/03/18 23:59:37 eva Exp $
+
+EAPI="2"
+
+inherit eutils gnome2
+
+DESCRIPTION="Library to construct graphical interfaces at runtime"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="LGPL-2"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/glib-2.10
+	>=x11-libs/gtk+-2.8.10
+	>=dev-libs/atk-1.9
+	>=dev-libs/libxml2-2.4.10
+	>=dev-lang/python-2.0-r7"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	# patch to stop make install installing the xml catalog
+	# because we do it ourselves in postinst()
+	epatch "${FILESDIR}"/Makefile.in.am-2.4.2-xmlcatalog.patch
+
+	# patch to not throw a warning with gtk+-2.14 during tests, as it triggers abort
+	epatch "${FILESDIR}/${PN}-2.6.3-fix_tests-page_size.patch"
+}
+
+src_install() {
+	dodir /etc/xml
+	gnome2_src_install
+}
+
+pkg_postinst() {
+	echo ">>> Updating XML catalog"
+	/usr/bin/xmlcatalog --noout --add "system" \
+		"http://glade.gnome.org/glade-2.0.dtd" \
+		/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	echo ">>> removing entries from the XML catalog"
+	/usr/bin/xmlcatalog --noout --del \
+		/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog
+}