Port recent changes to 9999

(Portage version: 2.1.10.49/cvs/Linux x86_64)

2 files changed, 27 insertions, 26 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/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/*
 }