New version, had to rework the patch slightly to fit the new Makefile.am/in

5 files changed, 101 insertions, 7 deletions

diff --git a/gnome-base/libglade/ChangeLog b/gnome-base/libglade/ChangeLog
index 6feeae665fa2..ae83b1ad0097 100644
--- a/gnome-base/libglade/ChangeLog
+++ b/gnome-base/libglade/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/libglade
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v 1.52 2004/11/05 22:42:05 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v 1.53 2004/12/06 03:09:34 obz Exp $
+
+*libglade-2.4.1 (06 Dec 2004)
+
+  06 Dec 2004; Mike Gardiner <obz@gentoo.org> +libglade-2.4.1.ebuild:
+  New version, had to rework the patch slightly to fit the new Makefile.am/in
 
   05 Nov 2004; Markus Rothe <corsair@gentoo.org> libglade-0.17-r6.ebuild:
   Marked ~ppc64; bug #69450
diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest
index cdc23737ac02..fad91df668c8 100644
--- a/gnome-base/libglade/Manifest
+++ b/gnome-base/libglade/Manifest
@@ -1,11 +1,14 @@
-MD5 cf70a03086815aac4acfece03a77306a ChangeLog 6954
-MD5 5b7172c717cb55d8263bcaa17964dd60 libglade-0.17-r6.ebuild 1439
+MD5 e1a53a45c8f84abf9731010a9f50ff84 .libglade-2.4.1.ebuild.swp 12288
+MD5 97c1772a42180f7cf7dc141880820af0 libglade-2.4.1.ebuild 1184
 MD5 3f9eba4e9c355509a927fc2b5b5daca0 libglade-2.0.1.ebuild 1471
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 cc840271f12be8cd84870816890efa95 libglade-2.3.6.ebuild 1274
+MD5 5b7172c717cb55d8263bcaa17964dd60 libglade-0.17-r6.ebuild 1439
 MD5 37ee33304a13be8c939c7d29d3ad758d libglade-2.4.0.ebuild 1278
-MD5 ba2eb9b8a5caed325917e267ef33d8ac files/Makefile.in.am-xmlcatalog.patch 958
-MD5 6876e5db1b80846b82a289a82b44408b files/digest-libglade-0.17-r6 65
+MD5 cf70a03086815aac4acfece03a77306a ChangeLog 6954
+MD5 cc840271f12be8cd84870816890efa95 libglade-2.3.6.ebuild 1274
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 77fafb164d53dc862957a5bd2b7511e4 files/digest-libglade-2.0.1 67
 MD5 0e14f0bbde2cbecd9f66ac06ff331b5b files/digest-libglade-2.3.6 67
 MD5 a3f0933d4f32dd139bedca018221f4dd files/digest-libglade-2.4.0 67
+MD5 92d6d3f34d14de525081920b263e33ec files/digest-libglade-2.4.1 67
+MD5 6876e5db1b80846b82a289a82b44408b files/digest-libglade-0.17-r6 65
+MD5 ba2eb9b8a5caed325917e267ef33d8ac files/Makefile.in.am-xmlcatalog.patch 958
diff --git a/gnome-base/libglade/files/Makefile.in.am-2.4.1-xmlcatalog.patch b/gnome-base/libglade/files/Makefile.in.am-2.4.1-xmlcatalog.patch
new file mode 100644
index 000000000000..4cf6a0170c2e
--- /dev/null
+++ b/gnome-base/libglade/files/Makefile.in.am-2.4.1-xmlcatalog.patch
@@ -0,0 +1,24 @@
+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
+@@ -24,7 +24,7 @@
+ 
+ if HAVE_XMLCATALOG
+ install-data-local:
+-	-$(XMLCATALOG) --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE)
++#	-$(XMLCATALOG) --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE)
+ 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
+@@ -819,7 +819,7 @@
+ 
+ 
+ @HAVE_XMLCATALOG_TRUE@install-data-local:
+-@HAVE_XMLCATALOG_TRUE@	-$(XMLCATALOG) --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE)
++@HAVE_XMLCATALOG_TRUE@#	-$(XMLCATALOG) --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE)
+ @HAVE_XMLCATALOG_TRUE@uninstall-local:
+ @HAVE_XMLCATALOG_TRUE@	-$(XMLCATALOG) --noout --del $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE)
+ 
diff --git a/gnome-base/libglade/files/digest-libglade-2.4.1 b/gnome-base/libglade/files/digest-libglade-2.4.1
new file mode 100644
index 000000000000..54dc294851ca
--- /dev/null
+++ b/gnome-base/libglade/files/digest-libglade-2.4.1
@@ -0,0 +1 @@
+MD5 add87e5aef7d8a9ebb468bc0e4044440 libglade-2.4.1.tar.bz2 317285
diff --git a/gnome-base/libglade/libglade-2.4.1.ebuild b/gnome-base/libglade/libglade-2.4.1.ebuild
new file mode 100644
index 000000000000..361aa924efdb
--- /dev/null
+++ b/gnome-base/libglade/libglade-2.4.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/libglade-2.4.1.ebuild,v 1.1 2004/12/06 03:09:34 obz Exp $
+
+# FIXME : catalog stuff
+inherit gnome2 eutils
+
+DESCRIPTION="GLADE is a interface builder"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="LGPL-2"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-libs/glib-2.4
+	>=x11-libs/gtk+-2.4
+	>=dev-libs/atk-1
+	>=dev-libs/libxml2-2.4.10
+	>=dev-lang/python-2.0-r7"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+src_compile() {
+
+	# patch to stop make install installing the xml catalog
+	# because we do it ourselves in postinst()
+	epatch ${FILESDIR}/Makefile.in.am-${PV}-xmlcatalog.patch
+
+	gnome2_src_compile
+
+}
+
+DOCS="ABOUT-NLS AUTHORS COPYING  ChangeLog INSTALL NEWS README"
+
+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() {
+
+	echo ">>> removing entries from the XML catalog"
+	/usr/bin/xmlcatalog --noout --del \
+		/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog
+
+}