gnome-base/libglade: multilib-utize (but had to disable doc useflag :( )

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

2 files changed, 22 insertions, 17 deletions

diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest
index ff6528d..7b31c4d 100644
--- a/gnome-base/libglade/Manifest
+++ b/gnome-base/libglade/Manifest
@@ -3,6 +3,6 @@ AUX libglade-2.6.3-fix_tests-page_size.patch 369 SHA256 97342a2d5bdf561d145950f5
 AUX libglade-2.6.4-enable-extensions.patch 225 SHA256 cd9ae2d1d915c08cf81533e5e4b283bdd04c04e45d1f6bc8e246c95fa51ebdf1 SHA512 e9cf514612790984110f9c5dc8fe12f5e2b4707ea469a803f0db24dc1ff7561411e6e47faafa71037e23daa1a21b1bc8ac7fc6e699508c76e9cb5b4cf8c10fde WHIRLPOOL f8ea8bc95f035872657d848e8a853f0237e6fb47329b21aaa99851c60f17caa6973c77a1d1c09fb4b79f231894f2015c5c9c8925dba1b570e1c0f7b1834190c9
 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 2387 SHA256 aae55765ed920cd8f28136660ea30fdafba5397eb2bc429c491502803e9c42e3 SHA512 b0ca6ed1abe5fa960fc33ee4746b11cf965b68b2660ed2843f8146abff27ab66bbccb29de03aa160927db703f6bb2696cc06f60f671f5dffcf994d818bb04f58 WHIRLPOOL d9b6f672ac058e8ce74a996d6625108932320692a7f7a1f34a7a469e477cdaceee18dc0b52071c960bb4aabcab0e86b768cac428b55b9bc1f113cb4e4c582ff9
+EBUILD libglade-2.6.4-r1.ebuild 2460 SHA256 1f547382b8d3ed50d848ac7d1f1c751ede45ceffd1e3716248dbd208312009ce SHA512 5752cd67e50bace5339df30643657faf7c09acc98d67d8d11fbbcab89e1da05f30488e6fbc62aea8dc5c52677b9f0d6ca0567cef0cac450280d73f62aaae292c WHIRLPOOL c023eeed895d7dbd740774cd66ffc18b9d3b8d236ce32a5d85fe4d8a698eb227344231f2af33ac66ed446b2b99c65e871fe5b399cdf3a4c02b6aa16ce2e34cbf
 MISC ChangeLog 17115 SHA256 b9cb02869b2c6675cf63b6f187a7656f9b5d2d11f419d868cea5e682730d7841 SHA512 8fe2012f6432506f105fd233afe628dec7dc32a46254f8d042ff9ca7d004e07eac25b6928c203b9f4440364f7513258b595eb430b7ec52823950ea4320409112 WHIRLPOOL 5cf40da6bd1d6e029badee196be83987d852be8e2afef10eebe2cee6c2dc76180fa43be0e49d58081223b072c3a2d21bc79b93453f71582e6cc1135952480b72
 MISC metadata.xml 159 SHA256 b1ccd57b80d8d6ee7a9924844efd69830edfb744ab818d67e50a008b5aae7d4b SHA512 9408846d0f3194f62043b64e325aed9e8cce9a74b556865acf71facc3ad59a092dccbbb3c608ada40b73625eaac93a7bcc976858c6a47426bb8fadb6f830fe2b WHIRLPOOL 4700c8b71899b5acffcc46580315d4d116b478cfa283e0ea0569ab180e46850ce85d73c7370d989e53dd8aecb69ed843d2716bfebd3c5d74a7b5c3d4b94b96bb
diff --git a/gnome-base/libglade/libglade-2.6.4-r1.ebuild b/gnome-base/libglade/libglade-2.6.4-r1.ebuild
index a28be58..9207124 100644
--- a/gnome-base/libglade/libglade-2.6.4-r1.ebuild
+++ b/gnome-base/libglade/libglade-2.6.4-r1.ebuild
@@ -2,33 +2,35 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2"
+GNOME_TARBALL_SUFFIX="bz2"
 
-inherit autotools eutils gnome2 python virtualx
+inherit autotools eutils gnome2-multilib python virtualx
 
 DESCRIPTION="Library to construct graphical interfaces at runtime"
 HOMEPAGE="http://library.gnome.org/devel/libglade/stable/"
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs test"
+KEYWORDS="~amd64"
+IUSE="static-libs test"
 
-RDEPEND=">=dev-libs/glib-2.10:2
-	>=x11-libs/gtk+-2.8.10:2
-	>=dev-libs/atk-1.9
-	>=dev-libs/libxml2-2.4.10"
+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}]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1 )"
+	>=dev-util/gtk-doc-am-1.13"
 
 pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable static-libs static)"
+	G2CONF=("--disable-gtk-doc" "$(use_enable static-libs static)")
 	DOCS="AUTHORS ChangeLog NEWS README"
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {
@@ -52,17 +54,20 @@ src_prepare() {
 		sed 's/ tests//' -i Makefile.am Makefile.in || die "sed failed"
 	fi
 
-	gnome2_src_prepare
-	AT_NOELIBTOOLIZE=yes eautoreconf
+	AT_NOELIBTOOLIZE=yes
+	AUTOTOOLS_AUTORECONF=yes
+	gnome2-multilib_src_prepare
 }
 
-src_test() {
+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_src_install
+	gnome2-multilib_src_install
 	python_convert_shebangs 2 "${ED}"/usr/bin/libglade-convert
 }
 
@@ -71,11 +76,11 @@ pkg_postinst() {
 	"${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_pkg_postinst
+	gnome2-multilib_pkg_postinst
 }
 
 pkg_postrm() {
-	gnome2_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