Bump to 3.6.4. Bug fix release. Also include broken linking to system glade libs during make install (bug #268236).

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 81 insertions, 2 deletions

diff --git a/dev-util/glade/ChangeLog b/dev-util/glade/ChangeLog
index 62e6f252f90c..3af2c9a3d49b 100644
--- a/dev-util/glade/ChangeLog
+++ b/dev-util/glade/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/glade
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.113 2009/05/25 17:44:14 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.114 2009/06/07 19:21:45 ford_prefect Exp $
+
+*glade-3.6.4 (07 Jun 2009)
+
+  07 Jun 2009; Arun Raghavan <ford_prefect@gentoo.org> +glade-3.6.4.ebuild,
+  +files/glade-3.6.4-fix-linking.patch:
+  Bump to 3.6.4. Bug fix release. Also include broken linking to system
+  glade libs during make install (bug #268236).
 
 *glade-3.6.3 (25 May 2009)
 
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 162b622f05b8..3556390d27e5 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,8 +1,11 @@
+AUX glade-3.6.4-fix-linking.patch 622 RMD160 6cad3dee740f9c0eef972e9dc4fbfb7ecf1057cb SHA1 5cfd706c824a2fbcaf6865c1f55ff387a7d7e5c9 SHA256 300eb9580f19a1571706aeb63f467015cfdb10ebdd0db2a78107529de3af7345
 DIST glade-2.12.2.tar.bz2 1785723 RMD160 6035749c249492279794d508d3558a8aac17b6f0 SHA1 a43d89b147296244ba4b2efc67e8772d5155afff SHA256 50712d1e5cb369ee1399e9c78ac410e3e69c7582ac9bf1e11d27a7348d3d0a58
 DIST glade3-3.4.5.tar.bz2 1777173 RMD160 3fa7df673d1ca2106f1327aebc8c714eafa42dab SHA1 6f6e144a07edd0446f031bc40abcde8e9437c7f6 SHA256 4e83ee1ce3832232f3dfcab9efaf4fa1f7f026d8c63051c68a82d76bbae39c77
 DIST glade3-3.6.3.tar.bz2 2234796 RMD160 1f93ff992fe895879bb954b6a1c0c134ab4a1dd0 SHA1 2e93e0cad963a7921b35b98f7393f1b2b5812e08 SHA256 c2eeb519d5fe59c4247952d0f78abd7936a09641adaa8e719c930360f8a2501e
+DIST glade3-3.6.4.tar.bz2 2239237 RMD160 df54213f060b53bedcb36944a483b089529665d1 SHA1 3a00676c805f9b3559265c6fcc4d8cd6497a2340 SHA256 489b920c89a566a18b15765ff81e325da64b35f2dfc63e650c9c68555ae8e6df
 EBUILD glade-2.12.2-r1.ebuild 894 RMD160 6e3e4253cb8f3d20ff1c02defe609b60ce78c785 SHA1 4faf0400f327704f45f6ea2af686b0bf8236e935 SHA256 c82a9053a86ff857783733e298259b1c09db44eda52d77b4acd673d4d9362e93
 EBUILD glade-3.4.5.ebuild 1075 RMD160 3718890d11a2aaa23a10f5757125e390ec82c6cd SHA1 f9c1b1517e5f4bf438c1ec86da6a4ba495913ab2 SHA256 efb45f507c6a96e34752d599d6af18ab73486b5c45f0d094e73938c2f97430cc
 EBUILD glade-3.6.3.ebuild 1295 RMD160 c70a6568be396ed2b09c4911c9d3b20319c60a88 SHA1 1120a692a9e24f05df14502436ae77cf44ca0984 SHA256 9b822237a3c1cd1ad4d0b5d10fc309baa343f1b6bf335ba0c83fb2182e9dd06f
-MISC ChangeLog 14178 RMD160 9a91dcc6796880b63a69823477f89f3ef6dfea90 SHA1 8eec42cb4af02c8429baf999e466a7072f905626 SHA256 a85ee81da3cf040544e23ba6a6deff0b56ed0ec16eb4c13bc62f4baf559a3789
+EBUILD glade-3.6.4.ebuild 1364 RMD160 1107439b6b405eef7a3272b4d2329f9c8b224dac SHA1 826123a40ef42c2c87eff8854a2b601e0cc98806 SHA256 9acbd188229fddd0d1664baf7d199ebaae9ecbd47f3ba5715b5295b19e069c16
+MISC ChangeLog 14443 RMD160 fc3fad7cef0fc46e5f79220c46a539bb9a9881a8 SHA1 927ebe082571e2e9214515eb4b267d66cb044604 SHA256 1723c0dcc98b00787adf6f0cd9fe4d2be701af912ee8e67936dbcb46b24becbc
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
diff --git a/dev-util/glade/files/glade-3.6.4-fix-linking.patch b/dev-util/glade/files/glade-3.6.4-fix-linking.patch
new file mode 100644
index 000000000000..1386d1b238ee
--- /dev/null
+++ b/dev-util/glade/files/glade-3.6.4-fix-linking.patch
@@ -0,0 +1,12 @@
+diff -urNp glade3-3.6.3/plugins/python/Makefile.am glade3-3.6.3-new/plugins/python/Makefile.am
+--- glade3-3.6.3/plugins/python/Makefile.am	2009-06-02 01:07:45.000000000 +0530
++++ glade3-3.6.3-new/plugins/python/Makefile.am	2009-06-07 12:46:48.000000000 +0530
+@@ -19,7 +19,7 @@ libgladepython_la_CFLAGS = \
+ 	$(GTK_CFLAGS)                    \
+ 	$(PLUGINS_WARN_CFLAGS)           \
+ 	$(AM_CPPFLAGS)
+-libgladepython_la_LDFLAGS = -module -avoid-version $(PYTHON_LIBS) $(AM_LDFLAGS)
++libgladepython_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS)
+ libgladepython_la_LIBADD = $(libgladeui) $(PYTHON_LIBS)
+ 
+ if PLATFORM_WIN32
diff --git a/dev-util/glade/glade-3.6.4.ebuild b/dev-util/glade/glade-3.6.4.ebuild
new file mode 100644
index 000000000000..89970a6252e6
--- /dev/null
+++ b/dev-util/glade/glade-3.6.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.6.4.ebuild,v 1.1 2009/06/07 19:21:45 ford_prefect Exp $
+
+EAPI="2"
+
+inherit eutils autotools gnome2
+
+MY_PN="glade3"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="GNOME GUI Builder"
+HOMEPAGE="http://glade.gnome.org/"
+SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc gnome python"
+
+RDEPEND=">=dev-libs/glib-2.8.0
+	>=x11-libs/gtk+-2.14.0
+	>=dev-libs/libxml2-2.4
+	gnome?	(
+		>=gnome-base/libgnomeui-2.0
+		>=gnome-base/libbonoboui-2.0 )
+	python? ( >=dev-python/pygtk-2.10.0 )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.19
+	sys-devel/gettext
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.9
+	doc? ( >=dev-util/gtk-doc-1.9 )
+"
+
+S="${WORKDIR}/${MY_P}"
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		$(use_enable gnome)
+		$(use_enable python)
+	"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	epatch "${FILESDIR}/${P}-fix-linking.patch"
+
+	eautoreconf
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+}