sys-libs/uclibc++: Move to EAPI 5, use .xz sources, fix quotes

Package-Manager: portage-2.1.12.4

3 files changed, 30 insertions, 23 deletions

diff --git a/sys-libs/uclibc++/ChangeLog b/sys-libs/uclibc++/ChangeLog
index f4272954..2287db9f 100644
--- a/sys-libs/uclibc++/ChangeLog
+++ b/sys-libs/uclibc++/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Jun 2013; Bertrand Jacquin <beber@meleeweb.net> uclibc++-0.2.4.ebuild:
+  sys-libs/uclibc++: Move to EAPI 5, use .xz sources, fix quotes
+
   12 Jun 2013; Bertrand Jacquin <beber@meleeweb.net> -uclibc++-0.2.2-r1.ebuild:
   sys-libs/uclibc++: remove old
 
diff --git a/sys-libs/uclibc++/Manifest b/sys-libs/uclibc++/Manifest
index 89caa2d6..2b0b7679 100644
--- a/sys-libs/uclibc++/Manifest
+++ b/sys-libs/uclibc++/Manifest
@@ -1,4 +1,4 @@
-DIST uClibc++-0.2.4.tar.bz2 262711 SHA256 be16fc6a6eb2e59df420ee41e7042f38e27ebaf5c2762d90e75803364a7b00db WHIRLPOOL 3cfa602f54df19aea981086ee8794e7fc031c2e6a695ea1c674718b5590631a84f297987090113658289afd826a38b12c0464ebab44fb1b5d9b81e6e07859f4a
-EBUILD uclibc++-0.2.4.ebuild 1656 SHA256 b2bb9ec0ac7b6a763c3f216ab1b2f15f9ef4b4e27110c45c1605118a2a694313 WHIRLPOOL dccd8dbcedc2ea27387d73b113e59e3d0f2ff2dae2d349ee9f78ef50eef8a68efd2fc71df9ef12129aab077ed4d46c2b7d44484c743d97a0c37c9322518e2957
-MISC ChangeLog 834 SHA256 22a6fa1ac27152775d25be10d1d14e77626c7e57ea09dfd6f929d996e743f8b5 WHIRLPOOL d66b49125af840fac32ae37b54ac30cf17d91b46199ebacde43cb9b40d03ab460c0c7d1864dc343892c639830018ccb372599b8a4d86450276a9627fec5695a3
+DIST uClibc++-0.2.4.tar.xz 228292 SHA256 f9bb95a3bf00644b0d9b86ff853aa4435ddb91695ea71f9295177ff0da4c11bb WHIRLPOOL 926054058854bc3d6aa430f8e70cdcdba6d14d07f5fd96edf04025f43dae9952f70d606b189e0d4fc1a09cf01a9031166e1566869f622af9c55fe58a14f58af6
+EBUILD uclibc++-0.2.4.ebuild 1542 SHA256 cf00f47e3f944a6422935be4e5a7892da8b9877c5afd3bee984ff3272743c27f WHIRLPOOL 2dfd02c8d61a54f1e9bea1c8db562def2396bf262a44bc116abdf17d04b4a2f8ac12cfcec26dad29af1a32279ba820bd63b47d746892142c3165a39f91091274
+MISC ChangeLog 976 SHA256 03f84f82fa2c789fa498cfc8a35654ed66b21b5171d3cee43976a86941a44523 WHIRLPOOL 477ca7c7e87a8f4e0dafedaa3dfad929fe1f314046ad3c8d2e4f53c3efaf494fc65a6995a66fc76f44ca0c01f903e8748767d9c62db4c741163fd504d2627b4b
 MISC metadata.xml 254 SHA256 c56bc3d6780712c960298c70bb86867aeb6661e97a317cc624516b0e16b72fcc WHIRLPOOL 2ebbfaa14ef0c1847284fe64a79f052cd7e73b25a724fba728c084aaaf2dd0692e068eedcf42ccef7e205077f00c35780ded7ec69118dc01ddb988b4802e46ae
diff --git a/sys-libs/uclibc++/uclibc++-0.2.4.ebuild b/sys-libs/uclibc++/uclibc++-0.2.4.ebuild
index 6ff4ee57..f8e9fa96 100644
--- a/sys-libs/uclibc++/uclibc++-0.2.4.ebuild
+++ b/sys-libs/uclibc++/uclibc++-0.2.4.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/uclibc++/uclibc++-0.2.2-r1.ebuild,v 1.1 2007/10/01 22:47:12 solar Exp $
+# $Header: $
 
+EAPI=5
 inherit eutils toolchain-funcs
 
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
+export CTARGET="${CTARGET:-${CHOST}}"
+if [[ "${CTARGET}" == "${CHOST}" ]] ; then
+	if [[ "${CATEGORY/cross-}" != "${CATEGORY}" ]] ; then
+		export CTARGET="${CATEGORY/cross-}"
 	fi
 fi
 
 DESCRIPTION="embedded C++ library"
 HOMEPAGE="http://cxx.uclibc.org/"
-SRC_URI="http://cxx.uclibc.org/src/uClibc++-${PV}.tar.bz2"
+SRC_URI="http://cxx.uclibc.org/src/uClibc++-${PV}.tar.xz"
 
 LICENSE="GPL-2"
-[[ ${CTARGET} != ${CHOST} ]] \
+[[ "${CTARGET}" != "${CHOST}" ]] \
 	&& SLOT="${CTARGET}" \
 	|| SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~x86"
@@ -30,7 +31,7 @@ S="${WORKDIR}/uClibc++-${PV}"
 set_config() {
 	local val
 	sed -i -e "/$1/d" .config
-	if [[ -n $2 && $2 != "n" ]]; then
+	if [[ -n "$2" && "$2" != "n" ]]; then
 		val="$1=${2:-y}"
 		einfo "Enabling $1"
 	else
@@ -40,16 +41,18 @@ set_config() {
 	echo "$val" >> .config
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	sed -i -e "s: -Wl,-s$: ${LDFLAGS}:" src/Makefile
-	emake -j1 -s defconfig > /dev/null || die "defconfig failed"
+}
+
+src_configure() {
+	emake -s defconfig > /dev/null \
+		|| die "defconfig failed"
+
 	set_config UCLIBCXX_RUNTIME_PREFIX "\"/usr/${CTARGET}\""
 	set_config BUILD_STATIC_LIB y
-	if use static; then
-		set_config BUILD_ONLY_STATIC_LIB y
-	fi
+
+	use static && set_config BUILD_ONLY_STATIC_LIB y
 #	if use elibc_uclibc; then
 		set_config UCLIBCXX_HAS_TLS n
 #	fi
@@ -60,13 +63,14 @@ src_compile() {
 	emake \
 		STRIPTOOL="true" \
 		OPTIMIZATION="${CXXFLAGS}" \
-		CROSS=${CTARGET}- \
-		|| die "make failed"
+		CROSS="${CTARGET}-"
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	emake install DESTDIR="${ED}"
+
 	dodir /usr/bin
-	dosym /usr/${CTARGET}/bin/g++-uc /usr/bin/g++-uc
+	dosym "/usr/${CTARGET}/bin/g++-uc" /usr/bin/g++-uc
+
 	dodoc ChangeLog README TODO
 }