Port recent changes to 9999

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

3 files changed, 36 insertions, 35 deletions

diff --git a/dev-util/ticpp/ChangeLog b/dev-util/ticpp/ChangeLog
index 489483e07425..edf7259a783c 100644
--- a/dev-util/ticpp/ChangeLog
+++ b/dev-util/ticpp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/ticpp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ticpp/ChangeLog,v 1.7 2012/06/17 22:16:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ticpp/ChangeLog,v 1.8 2012/06/18 08:38:12 ago Exp $
+
+  18 Jun 2012; Agostino Sarubbo <ago@gentoo.org> ticpp-9999.ebuild:
+  Port recent changes to 9999
 
 *ticpp-0_p20120423 (17 Jun 2012)
 
diff --git a/dev-util/ticpp/Manifest b/dev-util/ticpp/Manifest
index bfdf15a85406..69bd51f3eaac 100644
--- a/dev-util/ticpp/Manifest
+++ b/dev-util/ticpp/Manifest
@@ -5,17 +5,17 @@ DIST ticpp-0_p20100924.tar.bz2 75770 RMD160 c32e8ff06fae3ed451a77959bdc3276f876f
 DIST ticpp-0_p20120423.tar.bz2 94818 RMD160 7ed20ea950dda1d26ba74044e8da873270c625bd SHA1 9b98a4eb601e1eb9086dde14dad4803fcadd31c4 SHA256 b131ecebcd6a7e589a4b1c365c15f73535b4ac07cf538d4cdf26399fd4d2a631
 EBUILD ticpp-0_p20100924.ebuild 1283 RMD160 a4bde2249b6c7c6482d657804325377672e7eb47 SHA1 1886d1d9233c84d49c54e40b01dfb72130acf793 SHA256 095946610bad324830204f811cb2ae7109f9c58b7c2f4f2ea717710a403442ea
 EBUILD ticpp-0_p20120423.ebuild 1063 RMD160 deeec1fdf8131163e89bff141a156b3c44b8d246 SHA1 8d179183464988f25cbc82a15c6b4a19c145343e SHA256 9363eb7a079095ee5309ecc212086387d33986966382804d08cddccb3729c374
-EBUILD ticpp-9999.ebuild 1312 RMD160 11cdee0c12e7b30713d4efcc8c2ed822a7aa3b4d SHA1 f99680d1c8d23eeafc746d7b12849076067e8754 SHA256 c9d683b87d8d34f0c8bbefdd972790e11c73ae4dc7c9467d84d35b8d2613dce5
-MISC ChangeLog 1190 RMD160 bc5d35b44ef4ce5f28d8bb71dab38fa384c8d0e2 SHA1 836542d82299ec67acddaab33fe1d8d4830d2b83 SHA256 772022f64445cab779ee0d5e7f5c52195a58b614570759a69b2b9ea389010986
+EBUILD ticpp-9999.ebuild 1092 RMD160 25fd95729d6fb9047ead0fc063e94e7bc364e67d SHA1 abe8115009f821f3083f760fdc714d4898c1ce4d SHA256 619ce70f5cbe1ca60c5005b9d749c3bd10073a63095708d3bcd6bd2d73b8f6f0
+MISC ChangeLog 1289 RMD160 5f0d70441614f67e7b5c4e907a5107b6cff01b08 SHA1 4d0954088b029a6e8dea0010fade9e959f281c8f SHA256 d726ea7c1dd87eb927ec4b60120e063f627c9e65c1c878d6a9eb2363d63c19a3
 MISC metadata.xml 233 RMD160 04e728c4544c783331521997841695e0c4f6bd98 SHA1 6c6a6bd8ed35085f55247cd2c9296f12a839e25b SHA256 77226fe2bb71a40e1ad91e1a4ddd1bb5728012844c345b01ccffc1f5ab92270e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP3ldOAAoJEOTDgjZ80txd06gH/0G2luaAJ0VdabW3VnwJWLjK
-MLQI9hkUas+ULymIW5S+MwZfhh+x7Y999LDgy/k8FJ7UPvSjGjKui5b7kbdfGeJb
-EZvmTWMGaifNR/FrueubBuxvVF+myEHgLrDSDppJ424rVppcK58yFSew6MjVUGO8
-7iQwXOt0VPpBdkBGRjQKP0cpeKsI1NXYdedsyso3Wy4GmFcmu5JQau9+Ignxd85C
-DNqu1vI2AiRla6DsioQXFkW8wUPgpLbOu5tMBX7ge20yrn2Ib+9+Rq8LMjXvRpuN
-wcrYlRvqtcWltYoz2Ko/TjnP5jlduupoLwAfbpEAoqRnXsKkfuXBNslDKBQGouI=
-=1hOj
+iQEcBAEBCgAGBQJP3uj/AAoJEOTDgjZ80txd3X0H/jkTJmxCi1cWnub2zGXlw5DH
+to/KzkgHGg8XC8DhO1gg9rYsor90hk2GwpUdqj7FaRXoIyxEBJ7JZ92zfgWGBgFm
+sfxGtePk9MqGiiYoQEssJrYU1mPmG+FMWt6sMxjCd3wr8RaHjZ1Cl3sqVKbpRk0M
+vqMXrCv/jdcBFLzqhsks9p+YJzIQjPCwY6IDFBXmPzfIsUjvriDP2GXi5YWsSY78
+EtkkELg6l8VL8x9R/0cfVZyEjt8viitzUVfuSt+tte7mfvuQbK+EboPvXb/wGrv8
+6iNuIg+jkrIQXOYOVSxHC97G57dq0c++6NUbue3zDHrGktbX3h24oLMc1FjhpLc=
+=CcES
 -----END PGP SIGNATURE-----
diff --git a/dev-util/ticpp/ticpp-9999.ebuild b/dev-util/ticpp/ticpp-9999.ebuild
index 9c0a4bd5f5e5..1068d084c401 100644
--- a/dev-util/ticpp/ticpp-9999.ebuild
+++ b/dev-util/ticpp/ticpp-9999.ebuild
@@ -1,57 +1,55 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ticpp/ticpp-9999.ebuild,v 1.1 2011/02/22 16:58:11 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ticpp/ticpp-9999.ebuild,v 1.2 2012/06/18 08:38:12 ago Exp $
+
+EAPI=4
 
-ESVN_REPO_URI="http://ticpp.googlecode.com/svn/trunk/"
 inherit subversion
 
+ESVN_REPO_URI="http://${PN}.googlecode.com/svn/trunk/"
 MY_PV=cvs
+
 DESCRIPTION="A completely new interface to TinyXML that uses MANY of the C++ strengths"
 HOMEPAGE="http://code.google.com/p/ticpp/"
 SRC_URI=""
 
 LICENSE="GPL-2"
-KEYWORDS=""
+KEYWORDS="amd64 ~x86"
 SLOT="0"
 IUSE="debug doc"
 
-DEPEND="dev-util/premake
-	doc? ( app-doc/doxygen sys-apps/sed )"
+DEPEND=">=dev-util/premake-4.3
+	doc? ( app-doc/doxygen )"
 RDEPEND=""
 
-S=${WORKDIR}/${PN}
+src_prepare() {
+	premake4 gmake || die
+
+	sed -i "s:\$(ARCH)::g" TiCPP.make || die
+}
 
 src_compile() {
 	local myconf
-
-	premake --target gnu || die "creating Makefile failed"
-
-	if use !debug ; then
-		myconf="CONFIG=Release"
-	fi
-
-	emake ${myconf} || die "emake failed"
+	use !debug && myconf="config=release"
+	emake ${myconf}
 
 	if use doc ; then
-		sed -i -e '/GENERATE_HTMLHELP/s:YES:NO:' dox || die "sed failed"
-		doxygen dox || die "doxygen failed"
+		sed -i -e '/GENERATE_HTMLHELP/s:YES:NO:' dox || die
+		doxygen dox || die
 	fi
 }
 
 src_install () {
 	insinto /usr/include/ticpp
-	doins *.h || die "installing headers failed"
+	doins *.h
 
 	if use debug ; then
-		dolib libticppd.a || die "installing library failed"
+		dolib lib/libticppd.a
 	else
-		dolib libticpp.a || die "installing library failed"
+		dolib lib/libticpp.a
 	fi
 
-	dodoc {changes,readme,tutorial_gettingStarted,tutorial_ticpp}.txt || \
-		die "dodoc failed"
+	dodoc {changes,readme,tutorial_gettingStarted,tutorial_ticpp}.txt
 
-	if use doc ; then
-		dohtml -r docs/* || die "installing docs failed"
-	fi
+	use doc && dohtml -r docs/*
 }