app-arch/torrentzip: Fix SRC_URI. Bump to EAPI 6. Bump to version 0.9

Also assign package to Alexander Miller <alex.miller@gmx.de>.

Gentoo-Bug: https://bugs.gentoo.org/575338

Package-Manager: portage-2.2.26

6 files changed, 59 insertions, 49 deletions

diff --git a/app-arch/torrentzip/Manifest b/app-arch/torrentzip/Manifest
index e167253fdcd1..91c231b30ce5 100644
--- a/app-arch/torrentzip/Manifest
+++ b/app-arch/torrentzip/Manifest
@@ -1,2 +1,2 @@
-DIST torrentzip-0.2.tar.gz 46971 SHA256 9e55f378ef5c75c452b3f52728a7503ca76e147e0ab2395b8c41de8c20995efd SHA512 802dd1bf55e0a31df75d8195c9d2d5610be8cb7f14d14278eba72b580aff3ad415711999db05a5425303380ebfc82a68896e276319e0ead5635d0a07615ba700 WHIRLPOOL 79c96f51a0b547b2651625a3b3aee6b7a769955e10b092654086a1d91a494d08f8dd732eee45b432ca97f4f6314af0f76907fa81b422ef94676e6d729994a61d
-DIST torrentzip-0.2.zip 69200 SHA256 3aa58e839743eebd97071e36585bb14cab0bddd22db646eb0765e1ae3ef2c749 SHA512 a6d6452940ab9070b96d598c7db306657afa34c3630160943260e6687e65985aa5aa8ad0b1319ee6470912207d6ef369fdb1168d5d528e8efd7405dc7722b1b8 WHIRLPOOL 0cad9f83e2d27795014be51b912d34350a59ad9c824f66237e1f15641daad812c92a7d5c6357e8d6a2517f08a381705f4eb057dc855700b007b99f3210046a1c
+DIST torrentzip-0.9.tar.gz 59007 SHA256 89059002613e3e9f06861ae90047e3d4ea6cc1b2cc4ef21bd75cb51cecb2bff6 SHA512 691cd25f501de3de16b5b15b2afadfc34b833c3e93208c2c3497674936580ad2c3532a02e02531b89974302eee7b36f7579a412718914b1b38044b78a39a4d4d WHIRLPOOL 0e172c0797d2577afd632d9d53d09a2cb25d05e78037984963996999a719aaf7295dc264554794f0b1f2eba8bb162c2ecc9d584a058c241b6f84849c0ab47e7b
+DIST trrntzip_v02_src.tar.gz 46971 SHA256 9e55f378ef5c75c452b3f52728a7503ca76e147e0ab2395b8c41de8c20995efd SHA512 802dd1bf55e0a31df75d8195c9d2d5610be8cb7f14d14278eba72b580aff3ad415711999db05a5425303380ebfc82a68896e276319e0ead5635d0a07615ba700 WHIRLPOOL 79c96f51a0b547b2651625a3b3aee6b7a769955e10b092654086a1d91a494d08f8dd732eee45b432ca97f4f6314af0f76907fa81b422ef94676e6d729994a61d
diff --git a/app-arch/torrentzip/files/torrentzip-0.2-fix-perms.patch b/app-arch/torrentzip/files/torrentzip-0.2-fix-perms.patch
new file mode 100644
index 000000000000..79df2ef21006
--- /dev/null
+++ b/app-arch/torrentzip/files/torrentzip-0.2-fix-perms.patch
@@ -0,0 +1,11 @@
+--- a/src/trrntzip.c
++++ b/src/trrntzip.c
+@@ -782,7 +782,7 @@
+
+           if (strstr (szTmpBuf, ".zip\0") && !(istat.st_mode & S_IWUSR))
+           {            
+-            chmod (direntp->d_name, S_IWUSR);
++            chmod (direntp->d_name, S_IWUSR | S_IRUSR);
+             mig.cEncounteredZips++;
+
+             if (!mig.fProcessLog)
diff --git a/app-arch/torrentzip/metadata.xml b/app-arch/torrentzip/metadata.xml
index 23d7bddd6493..c8b37f14144e 100644
--- a/app-arch/torrentzip/metadata.xml
+++ b/app-arch/torrentzip/metadata.xml
@@ -1,7 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>alex.miller@gmx.de</email>
+		<name>Alexander Miller</name>
+		<description>Proxied maintainer</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+
 	<longdescription>
 		TorrentZip is a replacement for MameZip. The goal of the program is to 
 		use standard values when creating zips to create identical files over 
diff --git a/app-arch/torrentzip/torrentzip-0.2-r2.ebuild b/app-arch/torrentzip/torrentzip-0.2-r2.ebuild
deleted file mode 100644
index e3cfa1a7da32..000000000000
--- a/app-arch/torrentzip/torrentzip-0.2-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools
-
-MY_PN="trrntzip"
-MY_PV="code-9"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Advanced archiver to create identical files over multiple systems"
-HOMEPAGE="https://sourceforge.net/projects/trrntzip"
-SRC_URI="http://sourceforge.net/code-snapshots/svn/t/tr/${MY_PN}/code/${MY_P}.zip -> ${P}.zip"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-DEPEND="sys-libs/zlib"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-function-declarations.patch"
-)
-
-src_prepare() {
-	# Source-code from sf.net snapshots has CRLF...
-	EPATCH_OPTS="--binary"
-
-	epatch "${PATCHES[@]}"
-
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	nonfatal dodoc README AUTHORS
-}
diff --git a/app-arch/torrentzip/torrentzip-0.2-r3.ebuild b/app-arch/torrentzip/torrentzip-0.2-r4.ebuild
index a921e9194e79..376bb43a0938 100644
--- a/app-arch/torrentzip/torrentzip-0.2-r3.ebuild
+++ b/app-arch/torrentzip/torrentzip-0.2-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI="6"
 
 inherit eutils autotools
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://sourceforge.net/projects/trrntzip"
 MY_PN="trrntzip"
 MY_P="${MY_PN}_v${PV/.}"
 
-SRC_URI="mirror://sourceforge/trrntzip/${MY_P}_src.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://sourceforge/trrntzip/${MY_P}_src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -22,11 +22,12 @@ RDEPEND="$DEPEND"
 
 S="${WORKDIR}/${MY_PN}"
 DOCS=(README AUTHORS)
+PATCHES=("${FILESDIR}/${P}-fix-perms.patch")
 
 src_prepare() {
-	export CPPFLAGS+=" -DOF\\(args\\)=args"
+	default
 
-	epatch_user
+	export CPPFLAGS+=" -DOF\\(args\\)=args"
 
 	eautoreconf
 }
diff --git a/app-arch/torrentzip/torrentzip-0.9.ebuild b/app-arch/torrentzip/torrentzip-0.9.ebuild
new file mode 100644
index 000000000000..9539caded077
--- /dev/null
+++ b/app-arch/torrentzip/torrentzip-0.9.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Create identical zip archives over multiple systems"
+HOMEPAGE="https://sourceforge.net/projects/trrntzip"
+SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	sys-libs/zlib"
+
+DEPEND="
+	${RDEPEND}
+	app-arch/unzip"
+
+DOCS=(README AUTHORS)
+
+src_prepare() {
+	default
+	export CPPFLAGS+=" -DOF\\(args\\)=args"
+	eautoreconf
+}