gnome-base/libglade-2.6.4-r2: revbump/merge

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

3 files changed, 131 insertions, 3 deletions

diff --git a/gnome-base/libglade/ChangeLog b/gnome-base/libglade/ChangeLog
index d5803a8..951161e 100644
--- a/gnome-base/libglade/ChangeLog
+++ b/gnome-base/libglade/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for gnome-base/libglade
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v 1.140 2013/02/23 02:19:26 zmedico Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libglade/ChangeLog,v 1.150 2014/05/17 15:31:25 ago Exp $
+
+  17 May 2014; Agostino Sarubbo <ago@gentoo.org> libglade-2.6.4-r1.ebuild:
+  Stable for alpha, wrt bug #508862
+
+  14 May 2014; Agostino Sarubbo <ago@gentoo.org> libglade-2.6.4-r1.ebuild:
+  Stable for sparc, wrt bug #508862
+
+  13 May 2014; Agostino Sarubbo <ago@gentoo.org> libglade-2.6.4-r1.ebuild:
+  Stable for ia64, wrt bug #508862
+
+  11 May 2014; Agostino Sarubbo <ago@gentoo.org> libglade-2.6.4-r1.ebuild:
+  Stable for ppc64, wrt bug #508862
+
+  10 May 2014; Agostino Sarubbo <ago@gentoo.org> libglade-2.6.4-r1.ebuild:
+  Stable for ppc, wrt bug #508862
+
+  04 May 2014; Pacho Ramos <pacho@gentoo.org> libglade-2.6.4-r1.ebuild:
+  x86 stable, bug 508862
+
+  04 May 2014; Pacho Ramos <pacho@gentoo.org> libglade-2.6.4-r1.ebuild:
+  amd64 stable, bug 508862
+
+  02 May 2014; Jeroen Roovers <jer@gentoo.org> libglade-2.6.4-r1.ebuild:
+  Stable for HPPA (bug #508862).
+
+  30 Apr 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libglade-2.6.4-r1.ebuild:
+  Add PYTHON_REQUIRED_USE to REQUIRED_USE, bug #509172, thanks to Kent Fredric.
+
+*libglade-2.6.4-r1 (27 Apr 2014)
+
+  27 Apr 2014; Michał Górny <mgorny@gentoo.org> +libglade-2.6.4-r1.ebuild:
+  Convert to python-single-r1, bug #481288.
 
   23 Feb 2013; Zac Medico <zmedico@gentoo.org> libglade-2.6.4.ebuild:
   Add ~arm-linux keyword.
diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest
index 7b31c4d..f123c56 100644
--- a/gnome-base/libglade/Manifest
+++ b/gnome-base/libglade/Manifest
@@ -4,5 +4,6 @@ AUX libglade-2.6.4-enable-extensions.patch 225 SHA256 cd9ae2d1d915c08cf81533e5e4
 AUX libglade-2.6.4-gold-glib-2.32.patch 544 SHA256 daa5e196cf17b4f046dffdc7e04e108b155f78b3788763ef619d121eada6a819 SHA512 d2d77d6e4d2bfe426222231dbca29b6003d33e3964ea6ab25f2f2c11d3b52ed9d1379c5f5d727980ad16b6db8d7bab2dc540830e169b70ce24e9afd8c170a1d8 WHIRLPOOL 117d514b7b8787dd0b8ded72c92e4c82c39d4429dbcf041250835e566afcb3adb1dea4ffec6d55d05f2f3f10b3fb942a9e6c9b9ab42ca7af43179fb83f6b351d
 DIST libglade-2.6.4.tar.bz2 356119 SHA256 64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec SHA512 b725842febaf4c1f0d305a629ae1c61ea2de24dd6f41937e806c078fada2cea483195ef40f5238ce2045e47130c92559e984f677de667b840dd7fff0f8559735 WHIRLPOOL d416c3c0cb43c59b521abb3f0283061f2d7fae521980cafc95bc5d578b3ef551821f7d88ccf26b48de16f2568b29a1d5610d74ff7302363ea5a173ab189a5878
 EBUILD libglade-2.6.4-r1.ebuild 2460 SHA256 1f547382b8d3ed50d848ac7d1f1c751ede45ceffd1e3716248dbd208312009ce SHA512 5752cd67e50bace5339df30643657faf7c09acc98d67d8d11fbbcab89e1da05f30488e6fbc62aea8dc5c52677b9f0d6ca0567cef0cac450280d73f62aaae292c WHIRLPOOL c023eeed895d7dbd740774cd66ffc18b9d3b8d236ce32a5d85fe4d8a698eb227344231f2af33ac66ed446b2b99c65e871fe5b399cdf3a4c02b6aa16ce2e34cbf
-MISC ChangeLog 17115 SHA256 b9cb02869b2c6675cf63b6f187a7656f9b5d2d11f419d868cea5e682730d7841 SHA512 8fe2012f6432506f105fd233afe628dec7dc32a46254f8d042ff9ca7d004e07eac25b6928c203b9f4440364f7513258b595eb430b7ec52823950ea4320409112 WHIRLPOOL 5cf40da6bd1d6e029badee196be83987d852be8e2afef10eebe2cee6c2dc76180fa43be0e49d58081223b072c3a2d21bc79b93453f71582e6cc1135952480b72
+EBUILD libglade-2.6.4-r2.ebuild 2587 SHA256 b33acc80f8961708685d7081773177c819f8a55c5189669e4765c91f9aa48689 SHA512 4890b17c56e11100df1a491f313ef33e622e7ab3817e66907d30e8cddbe55506ca45c24aca3d48891cbd8b6f179fb19d0d2c52ce20ce86e76c10513a3c8d7502 WHIRLPOOL d23a3032c71851d56ab0b41b4b12f0eb031b32280c6676452d4e92dc57935ae6e36bfbd3a251191201de5ad3a15d3f096ae96a574a5a815597759f4d2a0bc5ae
+MISC ChangeLog 18297 SHA256 4c6e7fe0851ee24c8258ac1fef79f204f43ef8098881ce2341d3bed826a01262 SHA512 095919060aac14f36db546c4e27b3378e7f4f8bfaf2d5acdb3fef0438bdecea502d84ad34e40c682fade74b2fe8225c1652c91cae7bee47cb357d787c0ecc739 WHIRLPOOL a2e22a2ea8e4f3c3f3fa6237cf246afc6f56565292a092a1f5cecabf0f6f2dc52d74de8cfa55444a6fa4c1be77a35dda43ba6189c35128d2d299f20b701039a6
 MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
diff --git a/gnome-base/libglade/libglade-2.6.4-r2.ebuild b/gnome-base/libglade/libglade-2.6.4-r2.ebuild
new file mode 100644
index 0000000..1a861aa
--- /dev/null
+++ b/gnome-base/libglade/libglade-2.6.4-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+GNOME2_LA_PUNT="yes"
+
+PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_REQ_USE='xml(+)'
+
+inherit autotools eutils gnome2-multilib python-single-r1 virtualx
+
+DESCRIPTION="Library to construct graphical interfaces at runtime"
+HOMEPAGE="http://library.gnome.org/devel/libglade/stable/"
+
+LICENSE="LGPL-2"
+SLOT="2.0"
+KEYWORDS="~amd64"
+IUSE="doc static-libs test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=dev-libs/glib-2.10:2[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-2.8.10:2[${MULTILIB_USEDEP}]
+	>=dev-libs/atk-1.9[${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.4.10[${MULTILIB_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+pkg_setup() {
+	G2CONF=( "$(use_enable static-libs static)" )
+	DOCS="AUTHORS ChangeLog NEWS README"
+
+	python-single-r1_pkg_setup
+}
+
+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"
+
+	# Fails with gold due to recent changes in glib-2.32's pkg-config files
+	epatch "${FILESDIR}/${P}-gold-glib-2.32.patch"
+
+	# Needed for solaris, else gcc finds a syntax error in /usr/include/signal.h
+	epatch "${FILESDIR}/${P}-enable-extensions.patch"
+
+	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+		glade/Makefile.am glade/Makefile.in || die
+
+	if ! use test; then
+		sed 's/ tests//' -i Makefile.am Makefile.in || die "sed failed"
+	fi
+
+	AT_NOELIBTOOLIZE=yes
+	AUTOTOOLS_AUTORECONF=yes
+	gnome2-multilib_src_prepare
+}
+
+ehook gnome2-multilib-per-abi-pre_src_test my_abi_pre_test
+my_abi_pre_test() {
+	Xemake check || die "make check failed"
+	return 1
+}
+
+src_install() {
+	dodir /etc/xml
+	gnome2-multilib_src_install
+
+	# /usr/bin/libglade-convert is the only Python thing in it
+	python_fix_shebang "${ED}"usr/bin/libglade-convert
+}
+
+pkg_postinst() {
+	echo ">>> Updating XML catalog"
+	"${EPREFIX}"/usr/bin/xmlcatalog --noout --add "system" \
+		"http://glade.gnome.org/glade-2.0.dtd" \
+		"${EPREFIX}"/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog
+	gnome2-multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2-multilib_pkg_postrm
+	echo ">>> removing entries from the XML catalog"
+	"${EPREFIX}"/usr/bin/xmlcatalog --noout --del \
+		"${EPREFIX}"/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog
+}