netsurf eclass preparation. Restore cross-compile functionality (thanks James Le Cuirot, bug 431884)

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

3 files changed, 48 insertions, 27 deletions

diff --git a/media-libs/libnsgif/ChangeLog b/media-libs/libnsgif/ChangeLog
index ed3b9cfe15d9..198c5ce0aaeb 100644
--- a/media-libs/libnsgif/ChangeLog
+++ b/media-libs/libnsgif/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libnsgif
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libnsgif/ChangeLog,v 1.2 2012/07/17 23:25:46 xmw Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnsgif/ChangeLog,v 1.3 2013/02/28 07:46:00 xmw Exp $
+
+  28 Feb 2013; Michael Weber <xmw@gentoo.org> libnsgif-0.0.3.ebuild:
+  netsurf eclass preparation. Restore cross-compile functionality (thanks James
+  Le Cuirot, bug 431884)
 
   17 Jul 2012; Michael Weber <xmw@gentoo.org> libnsgif-0.0.3.ebuild:
   Fix typo
diff --git a/media-libs/libnsgif/Manifest b/media-libs/libnsgif/Manifest
index e4a61ebfe23d..fa60cc7b7c4f 100644
--- a/media-libs/libnsgif/Manifest
+++ b/media-libs/libnsgif/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA256
 
 DIST libnsgif-0.0.3-src.tar.gz 213099 SHA256 7a1e6873bec6814289b653c630714246adc1040cc8b250c78bb309eaf8d5f19c SHA512 0e05dceca1c00d7b68139993ff4475bb974185b224a4edecf7a8b91b8088eb230b0f29d05cd67addc5281926bfbfeed394cdae7fb0c96ff62d9a54b0a019e5d4 WHIRLPOOL c340267bcda52568254cc48b75f4c6c133c559f05a017177aee37976c708d966df00c406197b59d38569f95b468c6a42e265a0a99c0edb073cc005a369064102
-EBUILD libnsgif-0.0.3.ebuild 1291 SHA256 55f5044f1d60002f197a13d17f6210d4ae87a0d3dd911e751688db6f2139c7fd SHA512 a8b396330c25df480d0bf39e28280635bd6cb3fa6e591ea0a14105e6f9f1ee6eb7ecfc23766c7cbb00247e929fceac149f9af82e53d43ee06c14e0b02355afd6 WHIRLPOOL c5751f7876d6249f13379f3e1fe703dab4910bcd213bb7cdba0ea746171e09bcddfe629f10e6b2e64dc90e1e2b4889159570b8e8b7d2ad5a61f9fdec86834d80
-MISC ChangeLog 424 SHA256 da3bf26617fc6d468333ace65edf796b4ac82d37b73abaca08b73ecd07f89d83 SHA512 dd23be3c5580bbd05ed075b5ac03aa941e94f3c8054620c228e976a47ab48c6e5fbd724f42e823208736e582e29a38ed23e9cd7e0c5d44003f1e5a4e383f150c WHIRLPOOL 9367f3c931d2be3fd260eedc2b7d535e7558767cdc237d8dd2528f6d038413248c4eab605768097cff06f92f0ce776dc5d0b7077742bd2511654d54833af11fe
+EBUILD libnsgif-0.0.3.ebuild 1506 SHA256 1c0c28a4c7d70f693069628e613b83cdcead07c094ad9e2888812cdd062eaec8 SHA512 5a02882f2e8dbe4fddf9d3bc97966b21dc6a8891d42f124f4d485c6e1976eb5a6388c879649cdbe6e1c3f1207632247dc579fc2aed49d4b5c61b42a31b1eff6c WHIRLPOOL 3816e56c789e98e48e202a316bb2d040a703ae780b5f1400a62a95e2ccdf627ef1a1fe6498d9ed382abb4b005c421f4465c348d722eaa69bdca7ad10d9df3015
+MISC ChangeLog 599 SHA256 1681a4deb1d0aaf2b23c12498ad2b7e7742dc6496c7bd6990df9ef7eb39d027d SHA512 7ca063b7c025356db99b3ff021776493aff1aa016837045e67a2955e54df272509268e16f19b8ebe06f9884d160988f63436f840fb954e018766f805415b3a63 WHIRLPOOL c5a262a13755c5fbdb2155915c92ab0f81d71fd0741fdebb60f1698c3473954da35055ab3a9a8481b5a55c69a20e3a4b52f5e2174172a5c370a39ea18e9cd441
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAF9D0ACgkQknrdDGLu8JAo3AD/Um53FcLqh1W51xJzt1bj/pY0
-MjoD6cFhpnEA9nxlNesA/2SvAauXv/eHf4enHNYbN1O9emN1QfB6gWn4jSkC/6Pl
-=FxNs
+iF4EAREIAAYFAlEvCzsACgkQknrdDGLu8JBYjAEAhSa53/wmzWFb8xgILYQUuFwO
+lRFK50KkxVBOmiUtQ4EA/3G6NiUeQBM6rry+4aQ9l3BG4SICNE5FZwSvGPDUnP40
+=QtNS
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libnsgif/libnsgif-0.0.3.ebuild b/media-libs/libnsgif/libnsgif-0.0.3.ebuild
index ad5e2d6c2a23..001465908e4b 100644
--- a/media-libs/libnsgif/libnsgif-0.0.3.ebuild
+++ b/media-libs/libnsgif/libnsgif-0.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libnsgif/libnsgif-0.0.3.ebuild,v 1.2 2012/07/17 23:25:46 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnsgif/libnsgif-0.0.3.ebuild,v 1.3 2013/02/28 07:46:00 xmw Exp $
 
-EAPI=4
+EAPI=5
 
 inherit multilib toolchain-funcs
 
@@ -13,34 +13,51 @@ SRC_URI="http://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm"
-IUSE="static-libs"
+IUSE="debug static-libs"
 
 RDEPEND=""
-DEPEND=""
+DEPEND="virtual/pkgconfig"
+
+pkg_setup(){
+	netsurf_src_prepare() {
+		sed -e "/^CCOPT :=/s:=.*:=:" \
+			-e "/^CCNOOPT :=/s:=.*:=:" \
+			-e "/^CCDBG :=/s:=.*:=:" \
+			-i build/makefiles/Makefile.{gcc,clang}
+		sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \
+			-i Makefile || die
+		sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
+			-i ${NETSURF_PKGCONFIG:-${PN}}.pc.in || die
+	}
+	netsurf_src_configure() {
+		echo "Q := " >> Makefile.config
+		echo "CC := $(tc-getCC)" >> Makefile.config
+		echo "AR := $(tc-getAR)" >> Makefile.config
+	}
+
+	netsurf_make() {
+		emake COMPONENT_TYPE=lib-shared BUILD=$(usex debug debug release) "$@"
+		use static-libs && \
+			emake COMPONENT_TYPE=lib-static BUILD=$(usex debug debug release) "$@"
+	}
+}
 
 src_prepare() {
-	sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \
-		-e "s:-Werror::g" \
-		-i Makefile || die
-	sed -e "/^libdir/s:/lib:/$(get_libdir):g" \
-		-i ${PN}.pc.in || die
-	echo "Q := " >> Makefile.config.override
-	echo "CC := $(tc-getCC)" >> Makefile.config.override
-	echo "AR := $(tc-getAR)" >> Makefile.config.override
+	netsurf_src_prepare
+}
+
+src_configure() {
+	netsurf_src_configure
 }
 
 src_compile() {
-	emake COMPONENT_TYPE=lib-shared
-	use static-libs && emake COMPONENT_TYPE=lib-static
+	netsurf_make
 }
 
 src_test() {
-	emake COMPONENT_TYPE=lib-shared test
-	use static-libs && emake COMPONENT_TYPE=lib-static test
+	netsurf_make test
 }
 
 src_install() {
-	emake COMPONENT_TYPE=lib-shared DESTDIR="${D}" PREFIX=/usr install
-	use static-libs && \
-		emake COMPONENT_TYPE=lib-static DESTDIR="${D}" PREFIX=/usr install
+	netsurf_make DESTDIR="${D}" PREFIX=/usr install
 }