Update to EAPI=4 and fix building w/automake-1.13

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 41 insertions, 31 deletions

diff --git a/net-misc/taylor-uucp/ChangeLog b/net-misc/taylor-uucp/ChangeLog
index d667f6332510..d0f55a7f7044 100644
--- a/net-misc/taylor-uucp/ChangeLog
+++ b/net-misc/taylor-uucp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/taylor-uucp
-# Copyright 2002-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/taylor-uucp/ChangeLog,v 1.34 2012/04/06 22:00:09 pacho Exp $
+# Copyright 2002-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/taylor-uucp/ChangeLog,v 1.35 2013/07/30 15:26:27 vapier Exp $
+
+  30 Jul 2013; Mike Frysinger <vapier@gentoo.org> taylor-uucp-1.07-r2.ebuild:
+  Update to EAPI=4 and fix building w/automake-1.13
 
   06 Apr 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #63588
diff --git a/net-misc/taylor-uucp/Manifest b/net-misc/taylor-uucp/Manifest
index ad1e184ff018..82b722ecf154 100644
--- a/net-misc/taylor-uucp/Manifest
+++ b/net-misc/taylor-uucp/Manifest
@@ -1,15 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX taylor-uucp-1.07-gentoo.patch 5049 RMD160 f326a71ef396bfb4d95ab95d2a8a2d2e9d16dd16 SHA1 f3380f1d82f6dd43807450e0f3f7861ce9701f54 SHA256 9b36431077d349a0b9ca38a9f3d2bdec5f2bbc282ab690514f2bbdadab8cde6a
-DIST uucp-1.07.tar.gz 1013234 RMD160 e265ecd08245dd2510db20430a7a0e387ef4df51 SHA1 e7c93c3aa6468f1b26dd4d9104dbbe8c2949e9ee SHA256 060c15bfba6cfd1171ad81f782789032113e199a5aded8f8e0c1c5bd1385b62c
-EBUILD taylor-uucp-1.07-r2.ebuild 1479 RMD160 a5453060e2421a1332bdcbded5954505c4b57280 SHA1 b5130149bbd77c01e6089b4d175f68feab760c77 SHA256 3b0377e44e306c085abd1dcd8b429167205a4c22923bd6d192aad52495d6c86a
-MISC ChangeLog 4505 RMD160 d318162036591673b3981732863cfd3c7e119079 SHA1 0298567488dc1c5a70946165a454ab316576151d SHA256 c96dba04d3b4e560958ce266896d8a3fd10151311ff0f8078d8357d2bc84a462
-MISC metadata.xml 365 RMD160 c6dba3c8de5587f5a9850d681ade4492f09ed95a SHA1 82f6d4cfb27f42da0f88a3649e2cb4370cfe85f1 SHA256 c295ba4b12712c7fc57ea95069db729cdc46a51c2504082b6a7bbe133b1db72e
+AUX taylor-uucp-1.07-gentoo.patch 5049 SHA256 9b36431077d349a0b9ca38a9f3d2bdec5f2bbc282ab690514f2bbdadab8cde6a SHA512 8d259ddf10c80ff6c349d3bec531f858d561f3f488fd6066d69ddb8d2242e9f22ff8781ce47dcdb10f3dbf4a073bc4bf3492f6fced30d8d129e6f81e860f971a WHIRLPOOL 7fbf4ab8a11c33d1641e888714a45c1481a2b4652e23691530820b4afb99a324fc0bf07c056a5f90ad7e3af3a4fcba71df17d0eafb61286c00f3ca098210cb22
+DIST uucp-1.07.tar.gz 1013234 SHA256 060c15bfba6cfd1171ad81f782789032113e199a5aded8f8e0c1c5bd1385b62c SHA512 13d215890234e638bed53dce7bab6eb78e0ce6b658f23ac1d7f8abc6e1d97963bef76aa4148ca644f450d5a1678fac940b73fbcd5845d7f5bea3afbd8055229b WHIRLPOOL d46615bfcef6a5348c71a90525d642edcd61c3aadb43737070b27cfc2e30660284dadff44499b09d17ce34855dda8c6dd9633d637f1e81f6f916eaef6aaed46e
+EBUILD taylor-uucp-1.07-r2.ebuild 1457 SHA256 d4f88f95326abb0b6377da2f82e5449a76cbcccf18fd158289439cea80fbe620 SHA512 99844054e7dd238584e1eb73bcd18d22a03009fd3837403f720f72c8c9cb94fb6a34f0a7cf49e2bede69d99b02a9e15b2c1c730354b52d3c638a48b140870019 WHIRLPOOL 38580c3e5196be84107f520070965e4e325341308466e8fc05d60da3fdc351f2c5620520b45d1336110140a15ae7db2db030c7b4d11f3ae05940e6c05f05702a
+MISC ChangeLog 4637 SHA256 8f92ed5c0ddb78e20fe6c007ee2ba604f469b0d78212620339c3d6d977cc3efc SHA512 794994e892a027f9d909e45b6c8ecb38eab94b44767ed7dd955756527b3bcbabfdcf87d41f35d16accae70ead2fd9e7725118d56c591d08ce485cd5583dda865 WHIRLPOOL 79e7059966d9022ba7db5ecc588592439de164b1ec36cbe2b746d33f15b8d4839df44cc5f107c57a9d31c1a84ed988d920e6bda3fa2aa41d6ec31083d6fb67f5
+MISC metadata.xml 365 SHA256 c295ba4b12712c7fc57ea95069db729cdc46a51c2504082b6a7bbe133b1db72e SHA512 03f7ec37b68b65bf2b23cbfa4c165192250b88a1b861d42ce8ccc599ac3b288650465152e63b7173d909741914b8aba683d6566bcac5deabf11315bc68440450 WHIRLPOOL 8a0fea015737ef11d08e4b5ec968be1db5b8c19be52e6d39302dcd547a5e1b7ca2a46dfe5dee4d0f2da25309699521f0f302cd710ded560138d86bb36ede7a28
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk9/Z24ACgkQCaWpQKGI+9RBdACfQZK/PJ0cNdfBN3BAPEPp8UEr
-XrQAn0vk1RBN4p74LdtpYIhuOzjGZdVL
-=CiCl
+iQIcBAEBCAAGBQJR99smAAoJELEHsLL7fEFWNAQQALKnGciyh/UeVhNENM12tOab
+13tF50OtrCmGcw/0tKYu2TlBXtmpt0r11CyINDm3fBsJmQzgNXitgLwWkKD3wzFt
+DesUGCjh+3WiPpk2HPbLEGTtxzn9k2UEuCaa1GVVRJ6K3a0ak5QV5chg4BnSgbZV
+Lez14BE1Y0EKzazCwZe18DEkcZyq+E4JOYuKER4AxZsd+gxIuVsWAr9dQU5MTEOb
+WJeixpb7j3RzWv/abTsDR4wqIGqOJUtLooLdG0x6TocPQnZaYihYNqg58o8WRsgm
+lsg/Yn4+TFe+6LhOJTOJ4sMyYZF6akc+u63hMBIeH4NAmnld8nUUAU7AdB7WlIcz
+ZAgpM3ZbsXS4zUB8IP9xhOsK/6f6zNKA7lfDx1kYDm01Nk/2MGj/FJER8Wtg4kVu
+on6ETbWuV1OxHLPrmgb87cl9uSiDfJsbasBg53hsuLHYZs2s0cub10OYdJcsDEFJ
+h0uP60rVNCUBHYf6KaMjgG6Dc8wWDnj31t+wqZW6VZ1j5Nzsjoa9iN81BQyKDmlt
+DamOsVajfdqGTrArukVfz7v7N8DAZDaxUDeywM/dzTPl1mNf6kGJ0UuzJF7HNnXD
++RKGleQxQCS4kFNeBaQDA7Yh2dY7Z1mGu74oq3PQc/YBznVWfL+oVZEUj1vr0MbX
+7Y5Zu+ME3ENFoUJPx6SC
+=7bdc
 -----END PGP SIGNATURE-----
diff --git a/net-misc/taylor-uucp/taylor-uucp-1.07-r2.ebuild b/net-misc/taylor-uucp/taylor-uucp-1.07-r2.ebuild
index 209e1d04eb1a..52acdf779a69 100644
--- a/net-misc/taylor-uucp/taylor-uucp-1.07-r2.ebuild
+++ b/net-misc/taylor-uucp/taylor-uucp-1.07-r2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/taylor-uucp/taylor-uucp-1.07-r2.ebuild,v 1.3 2009/03/06 18:48:28 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/taylor-uucp/taylor-uucp-1.07-r2.ebuild,v 1.4 2013/07/30 15:26:27 vapier Exp $
+
+EAPI="4"
 
 inherit eutils flag-o-matic autotools
 
@@ -8,28 +10,23 @@ DESCRIPTION="Taylor UUCP"
 HOMEPAGE="http://www.airs.com/ian/uucp.html"
 SRC_URI="mirror://gnu/uucp/uucp-${PV}.tar.gz"
 
-IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ia64 ppc sparc x86"
+IUSE=""
 
-DEPEND=">=sys-apps/sed-4"
-RDEPEND=""
-
-S="${WORKDIR}/uucp-1.07"
-
-src_unpack() {
-	unpack ${A}
+S="${WORKDIR}/uucp-${PV}"
 
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	mv configure.{in,ac} || die
+	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
 	eautoreconf
 }
 
-src_compile() {
-	append-flags -D_GNU_SOURCE -fno-strict-aliasing
-	econf --with-newconfigdir=/etc/uucp || die "configure failed"
-	make || die "make failed"
+src_configure() {
+	append-cppflags -D_GNU_SOURCE -fno-strict-aliasing
+	econf --with-newconfigdir=/etc/uucp
 }
 
 src_install() {
@@ -42,7 +39,7 @@ src_install() {
 	diropts -o uucp -g uucp -m 0775
 	keepdir /var/spool/uucppublic
 
-	make \
+	emake \
 		"prefix=${D}/usr" \
 		"sbindir=${D}/usr/sbin" \
 		"bindir=${D}/usr/bin" \
@@ -50,9 +47,9 @@ src_install() {
 		"man8dir=${D}/usr/share/man/man8" \
 		"newconfigdir=${D}/etc/uucp" \
 		"infodir=${D}/usr/share/info" \
-		install install-info || die "make install failed"
+		install install-info
 	sed -i -e 's:/usr/spool:/var/spool:g' sample/config
-	cp sample/* "${D}/etc/uucp"
+	cp sample/* "${ED}/etc/uucp" || die
 	dodoc ChangeLog NEWS README TODO
 }