4 files changed, 174 insertions, 10 deletions
diff --git a/app-arch/archwrap/ChangeLog b/app-arch/archwrap/ChangeLog
new file mode 100644
index 00000000..506728fc
--- /dev/null
+++ b/app-arch/archwrap/ChangeLog
@@ -0,0 +1,162 @@
+# ChangeLog for app-arch/archwrap
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*archwrap-1.26 (21 Jul 2015)
+
+  21 Jul 2015; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
+*archwrap-1.25 (18 Jul 2015)
+
+  18 Jul 2015; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
+*archwrap-1.24 (12 Jul 2015)
+
+  12 Jul 2015; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
+*archwrap-1.23 (27 Jun 2015)
+
+  27 Jun 2015; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Support -v/-q
+
+*archwrap-1.22 (16 Jun 2015)
+
+  16 Jun 2015; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
+*archwrap-1.21 (29 May 2015)
+
+  29 May 2015; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
+*archwrap-1.20 (10 May 2015)
+
+  10 May 2015; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
+*archwrap-1.19 (29 May 2014)
+
+  06 Jul 2014; Martin Väth <martin@mvath.de>:
+  New style github tarball
+
+  29 May 2014; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
+*archwrap-1.18 (14 Apr 2014)
+
+  14 Apr 2014; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
+*archwrap-1.17 (30 Mar 2014)
+
+  30 Mar 2014; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
+*archwrap-1.16 (20 Feb 2014)
+
+  20 Feb 2014; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
+*archwrap-1.15 (13 Jan 2014)
+
+  13 Jan 2014; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
+*archwrap-1.14 (27 Dec 2013)
+
+  27 Dec 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
+*archwrap-1.13 (25 Dec 2013)
+
+  25 Dec 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Support xattr
+
+*archwrap-1.12-r3 (18 Dec 2013)
+
+  18 Dec 2013; Martin Väth <martin@mvath.de>:
+  sed with correct path
+
+*archwrap-1.12-r2 (17 Dec 2013)
+
+  17 Dec 2013; Martin Väth <martin@mvath.de>:
+  archwrap.sh -> /usr/share/archwrap: it is not meant to be called by the user
+  Fix sh path
+
+*archwrap-1.12-r1 (21 Nov 2013)
+
+  21 Nov 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Fix symlink handling
+
+*archwrap-1.11 (02 Nov 2013)
+
+  02 Nov 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Shebang care
+
+*archwrap-1.10 (31 May 2013)
+
+  10 Sep 2013; Martin Väth <martin@mvath.de>:
+  Install zsh-completion unconditionally according to gentoo policy
+
+  31 Sep 2013; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild. Fix preserve defaults
+
+*archwrap-1.9 (08 May 2012)
+
+  28 Sep 2012; Martin Väth <martin@mvath.de>:
+  Bump to EAPI=5
+
+  12 May 2012; Martin Väth <martin@mvath.de>:
+  base->eutils
+
+  08 May 2012; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
+*archwrap-1.8 (07 May 2012)
+
+  07 May 2012; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
+*archwrap-1.7 (04 May 2012)
+
+  04 May 2012; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
+*archwrap-1.6 (13 Apr 2012)
+
+  15 Apr 2012; Martin Väth <martin@mvath.de>:
+  Inherit base
+
+  13 Apr 2012; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
+*archwrap-1.5 (08 Apr 2012)
+
+  08 Apr 2012; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
+*archwrap-1.4 (23 Mar 2012)
+
+  23 Mar 2012; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
+*archwrap-1.3 (28 Feb 2012)
+
+  19 Mar 2012; Martin Väth <martin@mvath.de>:
+  Use vcs-snapshot.eclass
+
+  28 Feb 2012; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
+*archwrap-1.2 (31 Jan 2012)
+
+  31 Jan 2012; Martin Väth <martin@mvath.de>:
+  Version bump, remove old ebuild
+
+*archwrap-1.1 (29 Jan 2012)
+
+  29 Jan 2012; Martin Väth <martin@mvath.de>:
+  New ebuild from scratch
diff --git a/app-arch/archwrap/Manifest b/app-arch/archwrap/Manifest
index e5d7cf0a..ab9a3642 100644
--- a/app-arch/archwrap/Manifest
+++ b/app-arch/archwrap/Manifest
@@ -1 +1 @@
-DIST archwrap-11.4.tar.gz 18465 SHA512 7bbb0e787ae1cec4cd1e7253a6f13625f0b6f0b0e10720651b40633496f37c122445e498f21b373a161626f2118aa7c137f1f52bcc689606290af9f0c098d902
+DIST archwrap-1.26.tar.gz 14098 SHA256 5bd917af8ad7b8e3c64bbd73919ea84b18f18cfd7e24c4cae342d2f24b2b4012 SHA512 218e97e36273ec5070db53ca3f5ca570d72011a51bd06d0075f394d0e66064fc0e8fa0944856573cfea35681e2d3e32fe2cdd77b164905a775f8181b09abba81 WHIRLPOOL 48c050c6ed9e52ce7082dca935859aafd2aea3a4b47c2b409f4f390b06385460fb1ac989ed655c10aad9546253c5f5b3a667cd146c0c5acd6766b03ad6c6ec51
diff --git a/app-arch/archwrap/archwrap-11.4.ebuild b/app-arch/archwrap/archwrap-1.26.ebuild
index f51b88d7..530af13f 100644
--- a/app-arch/archwrap/archwrap-11.4.ebuild
+++ b/app-arch/archwrap/archwrap-1.26.ebuild
@@ -1,8 +1,10 @@
-# Copyright 2012-2020 Martin V\"ath
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# $Id$
 
-EAPI=7
+EAPI=5
 RESTRICT="mirror"
+inherit eutils
 
 DESCRIPTION="A collection of POSIX shell scripts to invoke archiver programs"
 HOMEPAGE="https://github.com/vaeth/archwrap/"
@@ -10,9 +12,9 @@ SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
-RDEPEND=">=app-shells/push-3 !<app-arch/brotli-1.0.4"
+RDEPEND="app-shells/push"
 DEPEND=""
 
 src_prepare() {
@@ -20,10 +22,10 @@ src_prepare() {
 	use prefix || for i in bin/*
 	do	test -h "${i}" || sed -i \
 			-e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \
-			-e 's"^\. archwrap\.sh$". '"${EPREFIX}/usr/lib/archwrap/archwrap.sh"'"' \
+			-e 's"^\. archwrap\.sh$". '"${EPREFIX}/usr/share/archwrap/archwrap.sh"'"' \
 			-- "${i}" || die
 	done
-	default
+	epatch_user
 }
 
 src_install() {
@@ -36,9 +38,9 @@ src_install() {
 		then	dobin "${i}"
 		fi
 	done
-	insinto /usr/lib/archwrap
+	insinto /usr/share/archwrap
 	doins bin/archwrap.sh
 	insinto /usr/share/zsh/site-functions
 	doins zsh/*
-	dodoc README.md archwrap_alias
+	dodoc README archwrap_alias
 }
diff --git a/app-arch/archwrap/metadata.xml b/app-arch/archwrap/metadata.xml
index b769f544..9f364815 100644
--- a/app-arch/archwrap/metadata.xml
+++ b/app-arch/archwrap/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer>
 		<email>martin@mvath.de</email>
 		<name>Martin Väth</name>
 	</maintainer>