netsurf eclass preparation.

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

3 files changed, 46 insertions, 27 deletions

diff --git a/media-libs/libsvgtiny/ChangeLog b/media-libs/libsvgtiny/ChangeLog
index d6daeca6c272..e73ff1bf2d88 100644
--- a/media-libs/libsvgtiny/ChangeLog
+++ b/media-libs/libsvgtiny/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libsvgtiny
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsvgtiny/ChangeLog,v 1.4 2012/07/18 15:38:34 xmw Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsvgtiny/ChangeLog,v 1.5 2013/02/28 07:50:00 xmw Exp $
+
+  28 Feb 2013; Michael Weber <xmw@gentoo.org> libsvgtiny-0.0.2.ebuild:
+  netsurf eclass preparation.
 
   18 Jul 2012; Michael Weber <xmw@gentoo.org>
   -libsvgtiny-0.0.2_pre20120629.ebuild:
diff --git a/media-libs/libsvgtiny/Manifest b/media-libs/libsvgtiny/Manifest
index a01bec68133e..26ff1813ffde 100644
--- a/media-libs/libsvgtiny/Manifest
+++ b/media-libs/libsvgtiny/Manifest
@@ -3,14 +3,14 @@ Hash: SHA256
 
 DIST netsurf-2.9-full-src.tar.gz 4621932 SHA256 ade6ade7f66ce2f0a80df724bafefd18c17165166111c490837737aa2e09ae9d SHA512 8dfd4d845f5255ee4420c6d4454594eb34dda129096b4d6acb72bd00e976042e7caf80b075ed39d3d3bf3b070c297f73f889075200bd7fb3d2467ca8154c07f0 WHIRLPOOL dfd1151d1c92cf374f5223113328c43f12537c4bc9b17caa831fb5c1febbf70a27766f20bf333867e5104bb03b1cd39f02eed0d351ceec901f922b759d7b330b
 DIST netsurf-buildsystem-0_p20120717.tar.gz 12371 SHA256 ef2c931fcb14c7b4759c0868fd4e8f4fa730558d1b5b769ad46d557f3b66e7fe SHA512 349ce6995993aedb64a45539aab734248779fc581741ea4463a06b9f36bab49edf02af4281f8a25ce796ce08c8477635ad8e88505a57ea66d03d9b734a33bc77 WHIRLPOOL bdd7a68482671eb18e48cf549710ab095ecdd90bd7880400c56e0a71a534b043f49a0b597043e4b5bb93235154586bcf7a4d92e261fe159b6d53c05bd5d6f713
-EBUILD libsvgtiny-0.0.2.ebuild 1425 SHA256 64eaba83646d1c51d3fb94d1bf899297b87b614aa693a372dffa8a188c31788e SHA512 df04e53e9679e265320fd2980826de3aece0b78c697fc5fede5967083b908889f4f2fa33e5ef7dd996f05435fd2bdedfe97b1a86d25f03487e17d0c16a61ed86 WHIRLPOOL 46125de179bb2795c0c25a546a6233122feeac4fad383294999e82dbf1b6b37231b882bb441278f3c75dbe45ce6f8129ff23fd3b11ddb2ae3a4d5773b1d2b50e
+EBUILD libsvgtiny-0.0.2.ebuild 1637 SHA256 012d3437d593a438369b90130b29c58255763ccb2dc4ac03b7f516ca5c2b5f75 SHA512 5b42fede393306e1597e3c9b9f3e1641b068881711fef892676c951300641c31a42f65006bf27908387472075ec0635fb1b1838253cf76901b12c4091163f45e WHIRLPOOL 9da80ff84fdc7f6b99576ca94cba096fe5515ef9f6a2f10d922bc1e095737e0a98f37fb786d5f51b4275f536b8d981d6dab8bb223f5be73eedd2dfea04e1bd26
 EBUILD libsvgtiny-9999.ebuild 1516 SHA256 15b6ea189a82527a89b495dc6bdf943570ca182be99a3c8dd26cfa2be2130c1b SHA512 8db75d2d34d5af3155bd3df662d8cd5dd1a59c202ca0663088abf68c01d6c9593ca4310df6113320756421184b4fc5ba64ca8c03b1900c85e05d39369298659c WHIRLPOOL e7a4e99cdd9d65d26497aec85005d93362d391b9c99fa9e0bee54032bdf3e0400f7377fd0a6220c8003362b11cc5282ac1eef32421084dbec947e9f15731c140
-MISC ChangeLog 813 SHA256 aee7dcb7ca571b622a6fe743dd8e5a532ac17f5a255affd69f8124c63df96297 SHA512 7a1344b0738e70700fa398e2ea73d32d5b87eacabbc5a145b9664c000a7c2a8aaef9f9e458445d0df590ec5b1cfd9d040b8a8c5cf8d4b91640b0ce40ec5837c7 WHIRLPOOL 0fd2208571a25e280089c6b4b143d0e32e8ee759e28cfba9f4dcac0debaf00b2cc746f99b20381aa0b29f5cdb59f43ed325b78a2c7f89c319ae401eea7930d5f
+MISC ChangeLog 915 SHA256 7d490e34948573ee7ebd0f0d864956b66b37d7e4c99ff2c5878e1a0791f6cc7a SHA512 ed509baa6136f2c378db54cf40862f52961514659290c7351e6911adcf5f32c4b3e8dec0fa287d12ccf554a7c814f567970cdc015929c4332518e9471945bd52 WHIRLPOOL d3487c466ab79b9b5d784156bce99e5f4b82f0227f41e5601fe47ca00a459ad00edd786314e7aaf17c2d9234c68764239fd26146da1f07c8723f10fcec16f579
 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAG2D0ACgkQknrdDGLu8JBEhAD/fFk4nQfgJNb/pMdTx2qPMcBI
-RIVYTuGmEsetriL3QFQA/1GNLT+EV5zQ1dZTfEkv7TQBMydTdqXrM93ACtoJv3Lh
-=Askl
+iF4EAREIAAYFAlEvDCsACgkQknrdDGLu8JAJ4QEAja6v4KODHJk/5W+2ipAXCexK
+AudA9SNKbac2m15fJSMA/1iEhPWuyydaLM2s+6hlTgxEFKeWs1k6rAxelDYMr949
+=YYRW
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsvgtiny/libsvgtiny-0.0.2.ebuild b/media-libs/libsvgtiny/libsvgtiny-0.0.2.ebuild
index 88309a6c2df4..e9b8da2bf7da 100644
--- a/media-libs/libsvgtiny/libsvgtiny-0.0.2.ebuild
+++ b/media-libs/libsvgtiny/libsvgtiny-0.0.2.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/libsvgtiny/libsvgtiny-0.0.2.ebuild,v 1.1 2012/07/18 15:32:21 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsvgtiny/libsvgtiny-0.0.2.ebuild,v 1.2 2013/02/28 07:50:00 xmw Exp $
 
-EAPI=4
+EAPI=5
 
 inherit multilib toolchain-funcs
 
@@ -13,12 +13,35 @@ SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source-full/netsur
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm"
-IUSE="static-libs"
+IUSE="debug static-libs"
 
 RDEPEND=""
 DEPEND="dev-util/gperf
 	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_unpack() {
 	default
 	mv netsurf-2.9/${P} . || die
@@ -26,30 +49,23 @@ src_unpack() {
 }
 
 src_prepare() {
-	sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):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 DESTDIR="${D}" PREFIX=/usr COMPONENT_TYPE=lib-shared install
-	use static-libs && \
-		emake DESTDIR="${D}" PREFIX=/usr COMPONENT_TYPE=lib-static install
+	netsurf_make DESTDIR="${D}" PREFIX=/usr install
+
 	dodoc README
 }