app-arch/unar: Bump to 1.10.1, remove old

Package-Manager: portage-2.3.0

4 files changed, 9 insertions, 91 deletions

diff --git a/app-arch/unar/Manifest b/app-arch/unar/Manifest
index 44d44dd0a18b..f0db42c60db8 100644
--- a/app-arch/unar/Manifest
+++ b/app-arch/unar/Manifest
@@ -1,5 +1,3 @@
-DIST unar1.1_src.zip 3530742 SHA256 478f5ffd9707f3f295e088df42e1cd26dcf203590297a4bd35a95e9de186ed0e SHA512 9d2ca145497961cc9b8c786e49810394c0abed8077e806d873420c65eabef70b57a70f93741890f8e7ee231d145d45c9b3a614ddc8ef5d17f8f1603c7ac419a2 WHIRLPOOL 5494edc1b488ddc516fd7abd1e3697eb5b95b6046bcd99b308318f450049008252b781bc74411c716de38ecef523afbc684867db047d72f5cb020e3d68df03ec
-DIST unar1.2_src.zip 3599730 SHA256 653ebb2bb6568e6de9f5513aeaabf13b12ae55159e64709a6c20a4f45387c8d6 SHA512 9d78b90e04a4200a77cddcbc33b655d9ea841602ee1d2e59e77e7d103abeba0609e2fed6183d243b6a7ad24ed4680d2001206b6663b70df3d4bc404ecc116267 WHIRLPOOL 7dffdb3bc1a92ccec6496d3344df0ce528bd0f792ccec338f17f7dea6b645b3d2f2a79355ff5d6d613486405a116619638e3420ab1e3ce1a8a9034cc55dec046
-DIST unar1.5_src.zip 2530160 SHA256 22e9b6c31fb6dea27e59222bfaaa8aee08af92aed1cfcbff407d1cf11be6ea78 SHA512 a6239279b9706f43feb02f7a80993c360ed21d79e448f08fcc40f14ef078f24b21daf3974fc7f5880f3e5188880e903e028e5aaeaeb4565593d9945fbeced27b WHIRLPOOL 7242af7ba9c7a470bf31ca4860b35d00b1e88611083c6fcab872b0c2a6e2e53a6bcf03309c76f322e4334ead736ac0d7f93f5e66863268d334ea1fcf9ab57bf3
+DIST unar1.10.1_src.zip 2552535 SHA256 40967014a505b7a27864c49dc3b5d30b98ae4e6d4873783b2ef9ef9215fd092b SHA512 2755f1e2dcca68912f748587f195887d785d5c30933ca0d7a7de1dd35c6c1c115571e49f462fe15722e1b34560f02503382727e1df19a1f23d4a3cc75750434e WHIRLPOOL 980cc9224d2146a79c4e42c7890b4ca1f81824c2f04cb6c076c5a60a5a2e2dc98012c9076deb653cf0d4766533081b37baa0c0494ad6da355923b286ae51621f
 DIST unar1.6_src.zip 2531920 SHA256 818e6b8c3a6d54218acb13693191fdeb99d6d622e9eb480e615f68267dc6ff51 SHA512 4d48d04e89c67d35fb3b186850b4426ba90e1cbb7afca70bdea2d0dd1e92178c773494fda23fa58d44e8e92d5342b9a2efa3695d25f6d1104e481b9f6234b3a1 WHIRLPOOL e9bba9f6fadf3ef0537b653ca7d0063a47bb2746277d1e48354ba59aed3743a7509b38c72fe15eb3a4c58659355952aa0bb44cf346e48e08f235ed8fea32ae0b
 DIST unar1.8.1_src.zip 2526220 SHA256 67ccb1c780150840f38de63b8e7047717ef4c71b7574d9ef57bd9d9c93255709 SHA512 3c899f11ace75a9976f3b9d13ed7d700fe16a56783aab0b8581f72ce886229de696c9f1286b6d6a407e5f6151973588bfe14754ea81af94214bb662fc856e0e3 WHIRLPOOL d5f11810129c7a91443b0a9ca2a47fdbe4e9fcd08c2438c5e914344d238258cd387a65ffa15ec245fc927b38311700e14dd3e1dba89a8e34d2a4494e4442c286
diff --git a/app-arch/unar/unar-1.1.ebuild b/app-arch/unar/unar-1.1.ebuild
deleted file mode 100644
index c2b6e6dc7c1a..000000000000
--- a/app-arch/unar/unar-1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="Unpacker for various archiving formats, e.g. rar v3"
-HOMEPAGE="http://unarchiver.c3.cx/"
-SRC_URI="https://theunarchiver.googlecode.com/files/${PN}${PV}_src.zip"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="gnustep-base/gnustep-base
-	>=gnustep-base/gnustep-make-2.6.0[native-exceptions]
-	dev-libs/icu"
-DEPEND="${RDEPEND}
-	sys-devel/gcc[objc]"
-
-S="${WORKDIR}/The Unarchiver/XADMaster"
-
-src_compile() {
-	emake -f Makefile.linux \
-		CC="$(tc-getCC)" \
-		OBJCC="$(tc-getCC)" \
-		C_OPTS="-std=gnu99 ${CFLAGS}" \
-		OBJC_OPTS="-std=gnu99 ${CFLAGS}" \
-		LD="$(tc-getCC)" \
-		LDFLAGS="-Wl,--whole-archive -fexceptions -fgnu-runtime \
-		${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dobin unar lsar || die "dobin failed"
-	doman ../Extra/lsar.1 ../Extra/unar.1 || die "doman failed"
-}
diff --git a/app-arch/unar/unar-1.5.ebuild b/app-arch/unar/unar-1.10.1.ebuild
index 99dc19e9fb21..612ea59ae23b 100644
--- a/app-arch/unar/unar-1.5.ebuild
+++ b/app-arch/unar/unar-1.10.1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=4
+EAPI=5
 
 inherit toolchain-funcs
 
 DESCRIPTION="unpacker for various archiving formats, e.g. rar v3"
-HOMEPAGE="http://unarchiver.c3.cx/"
-SRC_URI="https://theunarchiver.googlecode.com/files/${PN}${PV}_src.zip"
+HOMEPAGE="https://unarchiver.c3.cx/"
+SRC_URI="https://unarchiver.c3.cx/downloads/${PN}${PV}_src.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -17,7 +17,7 @@ IUSE=""
 
 RDEPEND="gnustep-base/gnustep-base
 	>=gnustep-base/gnustep-make-2.6.0[native-exceptions]
-	dev-libs/icu"
+	dev-libs/icu:="
 DEPEND="${RDEPEND}
 	sys-devel/gcc[objc]"
 
@@ -29,9 +29,9 @@ src_compile() {
 		CC="$(tc-getCC)" \
 		CXX="$(tc-getCXX)" \
 		OBJCC="$(tc-getCC)" \
-		C_OPTS="-std=gnu99 ${CFLAGS} ${CPPFLAGS}" \
-		CXX_OPTS="${CXXFLAGS} ${CPPFLAGS}" \
-		OBJC_OPTS="-std=gnu99 ${CFLAGS} ${CPPFLAGS}" \
+		CFLAGS="${CFLAGS}" \
+		CXXFLAGS="${CXXFLAGS}" \
+		OBJCFLAGS="${CFLAGS}" \
 		LD="$(tc-getCXX)" \
 		LDFLAGS="-Wl,--whole-archive -fexceptions -fgnu-runtime ${LDFLAGS}"
 }
diff --git a/app-arch/unar/unar-1.2.ebuild b/app-arch/unar/unar-1.2.ebuild
deleted file mode 100644
index c2b6e6dc7c1a..000000000000
--- a/app-arch/unar/unar-1.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="Unpacker for various archiving formats, e.g. rar v3"
-HOMEPAGE="http://unarchiver.c3.cx/"
-SRC_URI="https://theunarchiver.googlecode.com/files/${PN}${PV}_src.zip"
-LICENSE="LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="gnustep-base/gnustep-base
-	>=gnustep-base/gnustep-make-2.6.0[native-exceptions]
-	dev-libs/icu"
-DEPEND="${RDEPEND}
-	sys-devel/gcc[objc]"
-
-S="${WORKDIR}/The Unarchiver/XADMaster"
-
-src_compile() {
-	emake -f Makefile.linux \
-		CC="$(tc-getCC)" \
-		OBJCC="$(tc-getCC)" \
-		C_OPTS="-std=gnu99 ${CFLAGS}" \
-		OBJC_OPTS="-std=gnu99 ${CFLAGS}" \
-		LD="$(tc-getCC)" \
-		LDFLAGS="-Wl,--whole-archive -fexceptions -fgnu-runtime \
-		${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dobin unar lsar || die "dobin failed"
-	doman ../Extra/lsar.1 ../Extra/unar.1 || die "doman failed"
-}