Fix incomplete EAPI transition #328913.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 81 insertions, 6 deletions

diff --git a/app-arch/tar/ChangeLog b/app-arch/tar/ChangeLog
index 1a51dea94291..c2b49d8bcdf8 100644
--- a/app-arch/tar/ChangeLog
+++ b/app-arch/tar/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/tar
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.153 2010/07/18 21:05:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.154 2010/07/19 21:52:44 vapier Exp $
+
+*tar-1.23-r4 (19 Jul 2010)
+
+  19 Jul 2010; Mike Frysinger <vapier@gentoo.org> +tar-1.23-r4.ebuild:
+  Fix incomplete EAPI transition #328913.
 
 *tar-1.23-r3 (18 Jul 2010)
 
diff --git a/app-arch/tar/Manifest b/app-arch/tar/Manifest
index 14a3a5fff143..07c372a9bd1a 100644
--- a/app-arch/tar/Manifest
+++ b/app-arch/tar/Manifest
@@ -18,13 +18,13 @@ EBUILD tar-1.20.ebuild 1654 RMD160 b7bb0fc7bdcfbf33d00fc8a337e8c15c9a801147 SHA1
 EBUILD tar-1.21-r1.ebuild 1782 RMD160 b720a7bd217875e8c03b0b41b460a35a28bcf49c SHA1 489f1d5205b3587d44d8b44c628c7da5525b519b SHA256 c6cc9ba591d974f1911b67e058fdc39fb5b598f031d9e717363ed30cea96e7b9
 EBUILD tar-1.22-r1.ebuild 1783 RMD160 63e68ca7d7e3e9ea66de96000eb87417f4c1f393 SHA1 79751f031b9dabc55ee749122d120085264b22f1 SHA256 253d53116b0a87c712aef285d55ee09dd9b68d213e73ecaaece9bdf597b9a500
 EBUILD tar-1.23-r2.ebuild 1757 RMD160 fe262e531e6edca865a1c49eb47bfca9f10b1edf SHA1 c2c58c2488f731adc4964fd19c6da415c93e31c5 SHA256 870839e7cfbbea1e978cb042a80b8283bffeacfe9e4f294e29591898a22ed103
-EBUILD tar-1.23-r3.ebuild 1849 RMD160 03d656920733cad0df3f5a96347681d95f6a785e SHA1 ba73ee6796865c5415f3709244cf26ab4388a58f SHA256 5734d9240b079917ce05598313e8cf24415b60514d77a6000e9a5e3b3bdce296
-MISC ChangeLog 22914 RMD160 1ce634d68a506142e083f47faf2d3806f245a1de SHA1 a5d5887424de4626dd33667adff13c5d1e6a2fc6 SHA256 f338b664d98783075eedb426d594bbb1003bc4a68e9fd616c753a4fb17af5eb0
+EBUILD tar-1.23-r4.ebuild 1824 RMD160 6721228dfd20f85bd93278148f0f7fa7d57db84f SHA1 8fa3f45e1c85c3a06ab6062940a37f3c67ce50c0 SHA256 25bde52ba653a03f48aa26dd0d86e5879e381260b7fae24f6095de5ef55b1de0
+MISC ChangeLog 23056 RMD160 81a4bda68312fffce5deb826cd90d6a84d5fbcd9 SHA1 4960616dedc7b19fa9728ed92650f8409519941b SHA256 5ca3197dce8ca4f5f27775ac7db262af61f0cef20731d30d2b8b21d994faa32b
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkxDbAEACgkQTwhj9JtAlp4zzAEAmHQI/TAa9K7N6SqJoDrtUGEz
-4aUDMv028ciU5ncH1doA/3872QAMW73M+lIwOnFBnIx9m3T3eXyeLptspaq1j9a8
-=5lmw
+iF4EAREIAAYFAkxEyHsACgkQTwhj9JtAlp64TQD7BGQsGRIFjPQxxMiy35dflROG
+PLxq5MNPkvY2sBDIqlABAMQJsR8wc8rA8QUvIbC5fKkS2U9Y6ayxCgAhIaHtj9Ie
+=U5Xq
 -----END PGP SIGNATURE-----
diff --git a/app-arch/tar/tar-1.23-r4.ebuild b/app-arch/tar/tar-1.23-r4.ebuild
new file mode 100644
index 000000000000..6c0d6b0248a3
--- /dev/null
+++ b/app-arch/tar/tar-1.23-r4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.23-r4.ebuild,v 1.1 2010/07/19 21:52:44 vapier Exp $
+
+EAPI="2"
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Use this to make tarballs :)"
+HOMEPAGE="http://www.gnu.org/software/tar/"
+SRC_URI="http://ftp.gnu.org/gnu/tar/${P}.tar.bz2
+	ftp://alpha.gnu.org/gnu/tar/${P}.tar.bz2
+	mirror://gnu/tar/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="nls static userland_GNU"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.10.35 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-revert-pipe.patch #309001
+	epatch "${FILESDIR}"/${P}-strncpy.patch #317139
+	epatch "${FILESDIR}"/${P}-symlink-k-hang.patch #327641
+	epatch "${FILESDIR}"/${P}-tests.patch #326785
+
+	if ! use userland_GNU ; then
+		sed -i \
+			-e 's:/backup\.sh:/gbackup.sh:' \
+			scripts/{backup,dump-remind,restore}.in \
+			|| die "sed non-GNU"
+	fi
+}
+
+src_configure() {
+	local myconf
+	use static && append-ldflags -static
+	use userland_GNU || myconf="--program-prefix=g"
+	# Work around bug in sandbox #67051
+	gl_cv_func_chown_follows_symlink=yes \
+	econf \
+		--enable-backup-scripts \
+		--bindir=/bin \
+		--libexecdir=/usr/sbin \
+		$(use_enable nls) \
+		${myconf}
+}
+
+src_install() {
+	local p=""
+	use userland_GNU || p=g
+
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	if [[ -z ${p} ]] ; then
+		# a nasty yet required piece of baggage
+		exeinto /etc
+		doexe "${FILESDIR}"/rmt || die
+	fi
+
+	dodoc AUTHORS ChangeLog* NEWS README* THANKS
+	newman "${FILESDIR}"/tar.1 ${p}tar.1
+	mv "${D}"/usr/sbin/${p}backup{,-tar}
+	mv "${D}"/usr/sbin/${p}restore{,-tar}
+
+	rm -f "${D}"/usr/$(get_libdir)/charset.alias
+}