Revision bump: EAPI 5, epatch_user, Prefix support and keywords. Drop old revision

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

3 files changed, 39 insertions, 37 deletions

diff --git a/dev-libs/STLport/ChangeLog b/dev-libs/STLport/ChangeLog
index 739d0869e1ae..9fbf68ce64d5 100644
--- a/dev-libs/STLport/ChangeLog
+++ b/dev-libs/STLport/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/STLport
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.86 2013/08/10 12:53:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/ChangeLog,v 1.87 2013/09/05 12:22:55 pinkbyte Exp $
+
+*STLport-5.2.1-r2 (05 Sep 2013)
+
+  05 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> -STLport-5.2.1.ebuild,
+  +STLport-5.2.1-r2.ebuild:
+  Revision bump: EAPI 5, epatch_user, Prefix support and keywords. Drop old
+  revision
 
   10 Aug 2013; Agostino Sarubbo <ago@gentoo.org> STLport-5.2.1-r1.ebuild:
   Stable for ppc, wrt bug #477142
diff --git a/dev-libs/STLport/Manifest b/dev-libs/STLport/Manifest
index 35e24e7a87bd..2631af27dea1 100644
--- a/dev-libs/STLport/Manifest
+++ b/dev-libs/STLport/Manifest
@@ -1,27 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST STLport-5.2.1.tar.bz2 717202 SHA256 755b007b982c4545086c43affc8ed32c0acd577ee206eb1f6967e250c3546fc9 SHA512 c619f1965e42a444714f6a2bcbade3428e09823ad056930b32bf8224b7b3e4b4ae82e25e4ba7b4584f73645a7838a677f314b7bc583d1d9bbcef6fcafc439141 WHIRLPOOL 0d8539b98dd57c8b548bcfaeed3866c348f7f750b676404f40b2beda3c5095a2d94496d670e9f13b7287033fecd8c9f997aad44dfb07b310a8236956bdf2d52e
-DIST STLport-patches-5.2.1-1.tbz2 4911 SHA256 3b9741849a303afc1f4ae30f4748e7de729786c3630885d1ac70734846b55e61 SHA512 68adb3bb4751270636feef1e35659b490069306127dcbb52d58ff5ab1d6deb005fb7315b5b53b9cc11bf1386645330a1e644104f06f2bf68cfa288b87f6ddd36 WHIRLPOOL c4a1cf7dcecfd68b2056529a826bc5132b49147c3901d06d79b8a5c949635fd854391954c56cf15af0f081bab7370e11020747e27e749d74916242ee69a339a4
 DIST STLport-patches-5.2.1-2.tbz2 5245 SHA256 ccf0803a0b5e3c887e52d6132eb48932d566a933d299ebb22858ebd39dddc0c4 SHA512 ddc1b282d1b8008f1f6d5aa3eee0f821063c00fdf851cb569f69955dd3e1ad46b3e57a5c458a1f54aa75737cafe848cf20685b729951a58e80f14234804b92bb WHIRLPOOL cbb1ba74aca4cd454855aad6371ac7140fef42aa70b30c29e70a3b6d24044e5acd221a5a12c90414fb20bfb26ea879e7e3839ff8857b717d793538ca67380e33
 EBUILD STLport-5.2.1-r1.ebuild 2662 SHA256 bf889f7c8e425b9c220632d6ec74155660ee1f00abf848b9b1cc0e5bca0910ba SHA512 e01d0ca34f2c346c97e12de6263ab7e266990ae197183b10ff9bbce1263e0958ba91905762ec0fe8f61437e7c2bbaf011ed1710842742dfe10c04f3c6f2354fc WHIRLPOOL a15cf9a748d9cd188ab2614ed961713169ca5cedaad2744f3e331406117c1a7c25bbb1761d8824292a3e73f610587891db515a7f9183e975aa6b6dea12db05ba
-EBUILD STLport-5.2.1.ebuild 2641 SHA256 6f996b3e8edb0419cd7c1030d3e5780127beff6c0a4148e8149bfd9d963ecf07 SHA512 67f34d97743ec61959975c1fcf1766e4ab19d9066487781a5279cde8eac81dc1d6402999e7c5f31d0f12c93a948a8fdb1806af9bdcc341666fb1cd22c506ebb8 WHIRLPOOL 789beeec95fb3f29bdde65885fa6492b4854a5879967cc503a24ae2d18e78b13bc58ac1d23bce3517a77c50c6b98bb804759b6ff735352286c6321e35fbd8681
-MISC ChangeLog 12358 SHA256 9f2586bc6e364d415f0ff4b9a598abd6647dd8693ebcbe1b7cddbcee4965a2fd SHA512 c14854b3c66a4d4c8c574a01bae2af0ada226a078a4f25e746601244482ff7efb3520de18b76bc77c08221376262884295d216292348f2ecb2098671efad2565 WHIRLPOOL 448a9eb009cb53c88e37b0b3661ecaf3998b3aaf41455a8a85cbb8a4df94a666305a65f4bfd5c7a63662634ec671f6c89f448cd008693c238342e2dc98e4c291
+EBUILD STLport-5.2.1-r2.ebuild 2716 SHA256 1e007fb527bddce2b18ecbb97489bc936ebc19469fa99c59fbecf4299420ed80 SHA512 92b648765e9fc515a0b2e6f7cfa25522e651f700887b1bbe8b8bb228c5c4493d1f8561ee119c763faf412a0008640ca1002ac3019d262163834e29330beaf714 WHIRLPOOL e7d559b6c2922f615e97ca1e95e0371b60d217e0e5659957dba10a38a5884f0f78be4a6f6c4dc8fbfc979af5ecf76f874c4fc5de0ae00750465f9c0883f266ba
+MISC ChangeLog 12585 SHA256 70b6d573a2f599ab16ba0862612f4cd64b9f0bea472bf7d5647f3ff3d9cc8623 SHA512 e768f7440ff04ae2d5424585e22617c1347742fc6c0f41faf9c1c94e3b493e03973ca571f4055dc7861bc7c8effe7957ad71dbacf763f6e3039baa1876e7273e WHIRLPOOL de551413432891002845c9fdfbee847b81107be792d5ff12e9743516b56edef4f5dfd0ca3100d8e2e64b6352eaa6b2205ac8b1faf044371802b051235b910262
 MISC metadata.xml 243 SHA256 a127aa93730ed7bb90edca642be63155aeb752bd38dcbd3b874fa496f7a70cc2 SHA512 56a7589e56b7dc8e8dda953cac84cf4210f09615da3d327b65a591b854f513dba53358fbc04977f35423ae6d640c953e2a6a1db634daa8c14195fec757ed60de WHIRLPOOL 639e2d8e4f5f059c8c53ec89f88251dd92043eab8134bd9410b3cd1ea6c730af331777e94e633815048282edef74f4a4c09e787b919e1c6ff45634e387cf3380
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSBjb/AAoJELp701BxlEWfY+cQAMZcnrt6dYj4fm6mG3lw37M2
-9+0hwI2HrKMq11geNGW+Gjd1e4oBz+20NLLmNhV9KrqYEPqXFp3ewHn16LyQxonR
-7BHyk4V8NIbOEDBQ2TkvkyibeD6b/FIiQMzplozSdGwrH4P+MCYVCbTbiqFUiXxG
-Brynz8BY74knPzm2G+cjAWo5uudIVcH7s3TLrdRW7RvqIvi1Sjhb/XWweDWZDlnJ
-GPZh0dUrTM/OyQ1tZnrcMGmYaseIKADYr/J3DjzWPr6dNRxsXy2eICkw+y+6I17O
-+DKO27W68PB83LoiElc7RSIvF7yBix7cYtKA6QBf7Z3CXA08Wqpt/R/EgLV/FnII
-xcaTU+OS8f8STQCxB6UScmyXJNs9UE3kevPqDiH7VawNcQuMS8DZc7x4jazTUqkd
-+K8oFb4udj6U/HoWHpshmaKzZSInB1t8PnT/ASGyOlH7AYXt7806tZBHHrMedV6p
-GBio7LCEDOv1O6vsMtO0smutELpSipkkTEaXl5SrAdWbf6zGzXN9DgVH/9Q/bqFQ
-ka2XS62RNgamC+eeVX5kCX/UUl1rW8lS5iQGQYVM0r3x6OEDGASfhrlXadMI9JKw
-pOWly/opF9H9bSYr0yhxOO9vUKBaPPwclykcPZHomLLChm/Pv3urdiMHi7B0wPsS
-GrTY2083s+ct0820f/qh
-=M+0m
+iQEcBAEBCAAGBQJSKHdHAAoJECo/aRed9267EK8IAJbQ8qEV1VZlwzJPrIuMKKW1
+DouVAkXe1vRK0BMF0eDlYeELhGeUNv6FuCHiKcRZ3xF7cM7TeTddfdB5gyj8nS0Z
+wNcGfioeIvQ7ZpjVvYK7jkhvoGx1gHHWN0mB29ow4Etiy7BlUZRcnmyYcxjGG5KE
+VxAlIjfvN5yjX09OwYPCHWQtALRLwgE61BHRboqUgbmFakkqJjtUQ3rKFA8umK1I
+0qXbGvsT7LNOdoSzSGdjR920KjoVdF/kIxozBVzc9mF2YSb1ppGgvQZ3D5SdikDO
+AFT95VI2Qimw0L2CHRtlQm0HrGIL/mD1YOgoFImd/9SEVKq+lJlWVJ53MStTT5c=
+=6Nit
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/STLport/STLport-5.2.1.ebuild b/dev-libs/STLport/STLport-5.2.1-r2.ebuild
index c8dfb3280659..cce651042497 100644
--- a/dev-libs/STLport/STLport-5.2.1.ebuild
+++ b/dev-libs/STLport/STLport-5.2.1-r2.ebuild
@@ -1,26 +1,28 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/STLport-5.2.1.ebuild,v 1.6 2013/01/04 15:15:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/STLport/STLport-5.2.1-r2.ebuild,v 1.1 2013/09/05 12:22:55 pinkbyte Exp $
 
-EAPI="2"
+EAPI="5"
 
 inherit eutils versionator toolchain-funcs multilib
 
-PATCH_V="1"
+PATCH_V="2"
 
 DESCRIPTION="C++ STL library"
 HOMEPAGE="http://stlport.sourceforge.net/"
 SRC_URI="mirror://sourceforge/stlport/${P}.tar.bz2
-	mirror://gentoo/distfiles/${PN}-patches-${PV}-${PATCH_V}.tbz2"
+	http://dev.gentoo.org/~xarthisius/distfiles/${PN}-patches-${PV}-${PATCH_V}.tbz2"
 
 LICENSE="boehm-gc HPND"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="boost debug static static-libs threads"
 
 DEPEND="boost? ( >=dev-libs/boost-1.35.0-r5 )"
 RDEPEND="${DEPEND}"
 
+DOCS=( README etc/ChangeLog doc/FAQ doc/README.utf8 )
+
 pkg_setup() {
 	# make sure OSNAME is not in the environment (bug #305399)
 	unset OSNAME
@@ -42,6 +44,8 @@ src_prepare() {
 	#define _LARGEFILE_SOURCE
 	#define _LARGEFILE64_SOURCE
 	EOF
+
+	epatch_user
 }
 
 src_configure() {
@@ -51,25 +55,24 @@ src_configure() {
 		BOOST_PKG="$(best_version ">=dev-libs/boost-1.35.0-r5")"
 		BOOST_VER="$(get_version_component_range 1-2 "${BOOST_PKG/*boost-/}")"
 		BOOST_VER="$(replace_all_version_separators _ "${BOOST_VER}")"
-		BOOST_INC="/usr/include/boost-${BOOST_VER}"
+		BOOST_INC="${EPREFIX}/usr/include/boost-${BOOST_VER}"
 
 		myconf+="--with-boost=${BOOST_INC} --with-system-boost "
 		# make sure user apps (e.g. other packges using STLport) use boost as well
 		sed -i \
 			-e 'N;N;N;s:/\**\n\(#define _STLP_USE_BOOST_SUPPORT 1\)*\n\*/:\1:' \
-			stlport/stl/config/user_config.h
+			stlport/stl/config/user_config.h || die
 	fi
 
-	use debug || myconf+="--without-debug "
-	use static-libs && myconf+="--enable-static "
-	use threads || myconf+="--without-thread "
-	use static && myconf+="--use-static-gcc "
-
 	# It's not an autoconf script
 	./configure \
-		--prefix=/usr \
-		--libdir=/usr/$(get_libdir) \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--use-compiler-family=gcc \
+		$(use debug || echo "--without-debug") \
+		$(use static && echo "--use-static-gcc") \
+		$(use static-libs && echo "--enable-static") \
+		$(use threads && echo "--without-thread") \
 		${myconf} \
 		--with-cc="$(tc-getCC)" \
 		--with-cxx="$(tc-getCXX)" \
@@ -82,15 +85,14 @@ src_install() {
 	# precreate some directories
 	dodir /usr/$(get_libdir)
 
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc README etc/ChangeLog etc/*.txt doc/*.txt doc/{FAQ,README.utf8}
+	default
+	dodoc etc/*.txt doc/*.txt
 }
 
 src_test() {
 	if use static ; then
 		ewarn "Tests don't work when building with USE=static. Skipping..."
-		return
+	else
+		default
 	fi
-	default
 }