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

(Portage version: 2.2_rc33/cvs/Linux i686)

3 files changed, 77 insertions, 1 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/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"
+}