EAPI=4 port and general build improvements by Agostino "ago" Sarubbo in bug #404221.

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

3 files changed, 24 insertions, 24 deletions

diff --git a/net-misc/dahdi-tools/ChangeLog b/net-misc/dahdi-tools/ChangeLog
index 029b619bb079..0224ce131f54 100644
--- a/net-misc/dahdi-tools/ChangeLog
+++ b/net-misc/dahdi-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/dahdi-tools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/ChangeLog,v 1.17 2012/04/22 12:22:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/ChangeLog,v 1.18 2012/05/04 16:19:59 chainsaw Exp $
+
+  04 May 2012; Tony Vroon <chainsaw@gentoo.org> dahdi-tools-2.5.0.ebuild:
+  EAPI=4 port and general build improvements by Agostino "ago" Sarubbo in bug
+  #404221.
 
   22 Apr 2012; Markus Meier <maekke@gentoo.org> dahdi-tools-2.5.0.ebuild:
   x86 stable, bug #404221
diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest
index 5b131d13548f..2fbbac4330b9 100644
--- a/net-misc/dahdi-tools/Manifest
+++ b/net-misc/dahdi-tools/Manifest
@@ -10,13 +10,14 @@ DIST dahdi-tools-2.4.1.tar.gz 537767 RMD160 476594db808640a3ff72ee292e46f520f66c
 DIST dahdi-tools-2.5.0.tar.gz 863218 RMD160 92d384811719d7889308c42bcf6b4811136b3036 SHA1 61f5ba3273b3c2151f48498442e37fd40fa9f4b9 SHA256 1bdfe6b863153d557a18e2eb8bbcea147012865cffdf359c2d6210981587669b
 DIST gentoo-dahdi-tools-patchset-0.2.tar.bz2 1970 RMD160 25e04ad11ca3638ee5e7fdfbbbdea3db7bc6d8a4 SHA1 c694d0693dc0f500bdcebf92aba0b4ba17cba63d SHA256 ce820d3f0eb85d16bacb35edac2d5f3386df2d4d58c68c47a92c7f38c9805560
 EBUILD dahdi-tools-2.4.1.ebuild 1498 RMD160 23e5df4c883625efe955ac806bbfdd99fa624aff SHA1 c8ea1a70e03633960c8929f0047741388951e3a3 SHA256 4d0b8853754c613e43d43aa8f20409662962807d600becd345aa17cf01983d03
-EBUILD dahdi-tools-2.5.0.ebuild 1510 RMD160 c99de659ee137d0961069179d62aaf8a8196e628 SHA1 1118f57c6f81ac9599e76b4ac99b02604d1e8410 SHA256 18319d28330dbefb15dd0bc961ec2b6f05220886af95bd86a992ebd5e487a14f
-MISC ChangeLog 4588 RMD160 9238f83993c88feeca719e0c00b1022d7bb44979 SHA1 f217cff1030df77bcf555f9427b144b2c12268a2 SHA256 f569f95dbcdbde31c0620033454962bb07e8f823b558e55615dd439fd1d3e0eb
+EBUILD dahdi-tools-2.5.0.ebuild 1263 RMD160 4bccbd1961afa4b3011bc1d9fab3c5ec71b98c09 SHA1 0172cf7989b6655c50cc0d7da22f305e9fd61103 SHA256 02d71111653c5debc8de9b59e460ee9127313817e6968080a8df84c1a1b4b52a
+MISC ChangeLog 4754 RMD160 6e472944e0cddda6ef3906ec953bfc3eb30f25b8 SHA1 da342779a3ee5556e5cc40ba18e0b3e2379a6de7 SHA256 5b0241ec4b5c19432330deafe7fd460029cbd515cf60093faeffadabf6776f07
+MISC dahdi-tools-2.5.0.ebuild.orig 1510 RMD160 c99de659ee137d0961069179d62aaf8a8196e628 SHA1 1118f57c6f81ac9599e76b4ac99b02604d1e8410 SHA256 18319d28330dbefb15dd0bc961ec2b6f05220886af95bd86a992ebd5e487a14f
 MISC metadata.xml 331 RMD160 787054aaa3e5371c7e256d2a0b4f5e909e43a88e SHA1 6bf8e650bccb629f9807fde8dd20681517f75aeb SHA256 a839d10d9b71eb3ccee2ac1f493d64ae841977358d8908dba94ead6c4b6cf0e8
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+T+K0ACgkQkKaRLQcq0GIk5QCfXQlFViUivA36K7rK/PWw/eV2
-KycAn1N6u94OJ/7pVIlwj1aUP/FfItsb
-=oSmU
+iEYEARECAAYFAk+kAb0ACgkQp5vW4rUFj5pOcwCfVN/hoq2GQsuZ149IVNgYOIxx
+KRIAoIGg7xg2h53LUcnZLHourrJmIeRy
+=B5LK
 -----END PGP SIGNATURE-----
diff --git a/net-misc/dahdi-tools/dahdi-tools-2.5.0.ebuild b/net-misc/dahdi-tools/dahdi-tools-2.5.0.ebuild
index 408b2f6381b5..6081312e7944 100644
--- a/net-misc/dahdi-tools/dahdi-tools-2.5.0.ebuild
+++ b/net-misc/dahdi-tools/dahdi-tools-2.5.0.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/dahdi-tools-2.5.0.ebuild,v 1.3 2012/04/22 12:22:15 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dahdi-tools/dahdi-tools-2.5.0.ebuild,v 1.4 2012/05/04 16:19:59 chainsaw Exp $
 
-EAPI=3
+EAPI=4
 
 inherit base
 
 DESCRIPTION="Userspace tools to configure the kernel modules from net-misc/dahdi"
 HOMEPAGE="http://www.asterisk.org"
-SRC_URI="http://downloads.digium.com/pub/telephony/dahdi-tools/releases/${P}.tar.gz
-	mirror://gentoo/gentoo-dahdi-tools-patchset-0.2.tar.bz2"
+SRC_URI="http://downloads.digium.com/pub/telephony/${PN}/releases/${P}.tar.gz
+	mirror://gentoo/gentoo-${PN}-patchset-0.2.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -25,25 +25,20 @@ DEPEND="dev-libs/newt
 RDEPEND="${DEPEND}"
 
 EPATCH_SUFFIX="diff"
-PATCHES=( "${WORKDIR}/dahdi-tools-patchset" )
+PATCHES=( "${WORKDIR}/${PN}-patchset" )
 
 src_compile() {
 	default_src_compile
-	emake tests || die "Failed compiling test utilities"
-	if use ppp; then
-		emake -C ppp || die "Failed compiling ppp plugin"
-	fi
+	emake tests
+	use ppp && emake -C ppp
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "Failed to install binaries"
-	if use ppp; then
-		emake DESTDIR="${D}" -C ppp install || die "Failed to install ppp plugin"
-	fi
-	emake DESTDIR="${D}" config || die "Failed to install configuration files"
-
-	dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen
-	dosbin hdlcverify timertest
+	emake DESTDIR="${D}" install
+	use ppp && emake DESTDIR="${D}" -C ppp install
+	emake DESTDIR="${D}" config
+
+	dosbin patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
 
 	# install init scripts
 	newinitd "${FILESDIR}"/dahdi.init2 dahdi