6 files changed, 15 insertions, 128 deletions
diff --git a/sys-fs/rar2fs/ChangeLog b/sys-fs/rar2fs/ChangeLog
index b5fa5900ee1d..b7ec9bc6fda4 100644
--- a/sys-fs/rar2fs/ChangeLog
+++ b/sys-fs/rar2fs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/rar2fs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/rar2fs/ChangeLog,v 1.9 2013/07/29 17:13:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/rar2fs/ChangeLog,v 1.10 2013/07/29 17:14:50 ssuominen Exp $
+
+  29 Jul 2013; Samuli Suominen <ssuominen@gentoo.org>
+  -files/rar2fs-1.16.0-destdir.patch,
+  -files/rar2fs-1.16.0_p20130509-destdir.patch, -rar2fs-1.16.0.ebuild,
+  -rar2fs-1.16.0_p20130509.ebuild:
+  old
 
 *rar2fs-1.17.2 (29 Jul 2013)
 
diff --git a/sys-fs/rar2fs/Manifest b/sys-fs/rar2fs/Manifest
index d597a44d9639..3e4fcf241926 100644
--- a/sys-fs/rar2fs/Manifest
+++ b/sys-fs/rar2fs/Manifest
@@ -1,24 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX rar2fs-1.16.0-destdir.patch 288 SHA256 d77b55410ae6b0acb29ad7e5eabcab622ca8203662b8976d85d5906bd10ee878 SHA512 35f7f3f82859e44fa943f0e9a349615dde0ba58e5f3b96824b52e51bfa25f74d51834b3bd35d2fe6b8dc0a460a377a168024bdf09116e098fef24471b53c7ddc WHIRLPOOL fbde141e0627b28cf4b00142852e3bcab95ffb3eb243c5884084b7774aa45ff4c5cacea6d4bacbede897a673bd6e2b19747c90a86014b723fcd458027ec4ee28
-AUX rar2fs-1.16.0_p20130509-destdir.patch 433 SHA256 a1836d071412f62204b04a181b9eaaa4ed1e2cce476590a001dec45ee5f969d5 SHA512 2473e54a48f8f614b3c160650fdb7d41ca2aeaad58f43141e5623553370d252a61e27d3137017be5e09eac5ca96a5922f05c146ca84c83d6b4a953b29c9ad7e2 WHIRLPOOL 7c26d299abb12e72b92dc0a65a0d2e02741f75ca9d6a99a3ce9ac7d112de8c77bce99fd4764df2f2523aab4ab15250d816820015a4b0259c4eab852fed7b9bfe
-DIST rar2fs-1.16.0.tar.gz 213277 SHA256 10ed907d879fd89349c796865aa4f093f084e0530a6b06758738c4a8310d0f4c SHA512 1fb82b50c58ac09122599d2f047de776aef4e28e27d4b4742741f80cd5c3239ed300a650abf74536ca9cc257d360ba1d1648f15222383f8801ab18911d70d32b WHIRLPOOL bf1190b03fa96c8503c7acfe8e2832416a25d61f0eb9ac66ee5fcb5c722295439afe3797bce62cf23ee2d4dcb5af841b6f5568cead56e80804c7c37a2688b332
-DIST rar2fs-1.16.0_p20130509.tar.xz 94004 SHA256 11759c22fcae3f9eef52264f6c16eadae13175297b75b289a7d332f2e3d03910 SHA512 662661ee377625003ed42c8dd99e89d92c09942ca1e55a6e12101607b63946a13b507fa1064987fb7fd651d987c6253dab35105ce5f5eb895d9e639b451b81ab WHIRLPOOL 22be196b3beb3e5a3040914f9abe78ab1d6ff3197bb4ad2c999e111d4a508a5e2a6f2c68118f63fa8f6ac204e8015a02ac5e63dedd8d555f70cb27bb3b17cb8c
 DIST rar2fs-1.17.2.tar.gz 216748 SHA256 c7a568be4c370470e13a132f875c44d45541fecae274b53566ad1d1430924ad0 SHA512 da1954fc0e8ff885f52ca926c02ff8292e2c81b93fc21cb9057dc931f2c63d79a2bcd29eedf50edd1744f0f2ffcaa686e320565648e9e732edad102bb4686250 WHIRLPOOL 0324391e9560503e1e80318f1c3c8a6e7425501488282c4d7f62bb7a51439ce6b2ad1a4b05707646e3c8bbdd783672adbd3717077ce2833febf336f44ab44a0a
-EBUILD rar2fs-1.16.0.ebuild 909 SHA256 ccaf15d57094c39c03b95fc01ce8b330dbe128c890bc4de00c587bea8fed4940 SHA512 450c4e1204350fb97d895ca0acadf6d60c7dc080a9b6f27610877bfbdbe8374a62777997d1b38873b468ab8466e7de4253cf886c331bbda34ae5c01d714752c2 WHIRLPOOL 728a09f9a7f21f0b27c3bd718d711946929df1efbccb5ce194c3677745bcfc6e7faf6b892601cd5c043b80125e7efb2ab364ddb067e25043eb9df45211ee866b
-EBUILD rar2fs-1.16.0_p20130509.ebuild 902 SHA256 b35a7d8518749992dc4793614b337b456de93409fe8b4852ba58b22e71257025 SHA512 83cc83b5c2dd9ff7f919f65b20014be364707f3b564e382ac5c120847f0d3fba0f5252cbaa74c0d022ee541ba73dc962fbceae5e86771cced59957b43542b8f3 WHIRLPOOL ef1a7904dd63dfffec1cc9c598b4dfc780238dc850c29ecd377797991d7964ce543ef4ed13ab3489ac51933594df89d16ce85ca3b583142608731d9f49626a38
 EBUILD rar2fs-1.17.2.ebuild 763 SHA256 226eed32bf75f4ef43bec35cce77625d3dc570181e843cf78ed6f86d61da6213 SHA512 b4655f08bf3db094f6892bdd2158e168f359d6246c3beb972d3d3e4ac2064e6df8efa09edc8114a0818db58abc816bb7ea3d6fe986e2c4e114907da4266e62cd WHIRLPOOL 490a65d838426a4c061f8b2e5f0ca086ebafca4be72cbdbd3f83c9dc62110dd76f37a34f78f3fc4feba96cc6dc0dd3ab59e4abf1bfa5c05f02380a916264461b
-MISC ChangeLog 1338 SHA256 e85c55aa7ef19bae10740e1ca3c79dfc50bfa60e91b7c143c43bb64d662550cc SHA512 c7208f68779474cf04ebf874f219553a3660a1fb657e0562f6109b9e8a0784b33d068e79104f38190ffb5f9905bd85cfbe1ad1897cc1b68ab47222ed19b59b88 WHIRLPOOL 7b35caba48d7f3c0818fb64fdf66f428b0e0ff7444ffe4810fde049a54b0a8fc09547687fd9c133b2c8f566047f56c5f041932f8d0cd4545bac670767279868b
+MISC ChangeLog 1544 SHA256 b96a32f4e575090a5a818cb56c7133ac7f3c97069d92605bbf79aef1899ef7ff SHA512 320344510524599d7c1ca5c928aa73745a06c89a693ee2d6d568999fe91b48c3097210b8c6bd6bf3c3e85e4df1348cf1ca72b0f55e17d8d2f63d29f354058f30 WHIRLPOOL ad9dd10d84e056535b19a09656144a771ed2b604511f1ba431f26fb32c5fae1d8c8f60670c905db079e06301cdfa04eb596d43c8f95107e970c168a0a42cc67c
 MISC metadata.xml 313 SHA256 d09a625195ea112473f516019103860b53942929347aa5cb4d083c0686b3add3 SHA512 4e3466d306b98dd41872f919939d23932985458a5537a160fd6d9fb6d57101aa228d6444da6a838facb6ea06f90a00f9b076e91f3333510ff3fc4bc31266c40c WHIRLPOOL b70da32ec9b87bac9a05e36ce2411be81a753f67e7d45fe4d43a1af78e5e8e56212247db967254f6c551e6e0e51939d62f51c45a59407bc19ab0176303cd4a10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR9qKJAAoJEEdUh39IaPFNu1wH/3By5OFljJK4r7NR3RsiFYkw
-YhLfT7/a12S3lZ1xmiEISAq9ilQ5O+BxZ9CfNQ8T1EBD2UAfcRR8sMd0JDp4XOvh
-J/DAVQPebaZO5IcvffSaDDX62EuQN0hnQYi/GlQe1r6I4GDdV9wl+3LSX4e2PBmN
-VZw5RPnrJNpsngEvp1cLgEMKPtCHwHuJ2KVTLTbE1vwm+RIRZxLTBlNvWSoVigVJ
-C/+n/BI/a9QmVqpttUiTz1neWIdRv/mtnUYQRCjz5P6waHvzu9I8Gd70dIVX3Xy7
-+kmKdtjccm/e+9LBKht+xmiFFQpNpBQ0htvyVikuWKkJX3uGC2aOn2DDscahFCk=
-=P2FW
+iQEcBAEBCAAGBQJR9qLCAAoJEEdUh39IaPFN9S0H/0gQ8aFkBXQnB5fYtCVxASm1
+KXybZzFiG3qZX8dSpd7+e7+6axvLWDzkh3VxpG1FapYMrKSbQ0vu2bRs8w5jUwt8
+YTJzA0bydu6epkwIGHUIXQmcIZ/IhmkBBmwJv+PmFGezs2Ra6TFeM7tSZ81ge3Rn
+gwuacB0KLXOGabC7EGFD2Ovy37LJ34DAepsJ4goi8AL1ZNfUqyd/RjwHVeWs7aD9
+QCJrmE976ecamNa0+ffIDL6ereHNeJmb+UOER+nxGNgxdfTqvGlKiZny9FC36+fE
+CzpEMdhW+AeeL/3695965L9eHjvWzZVWdk4pikQF4xdQWX39KgPjC+1ooRlw9WQ=
+=Bhv+
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/rar2fs/files/rar2fs-1.16.0-destdir.patch b/sys-fs/rar2fs/files/rar2fs-1.16.0-destdir.patch
deleted file mode 100644
index 40eed7a63e90..000000000000
--- a/sys-fs/rar2fs/files/rar2fs-1.16.0-destdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://code.google.com/p/rar2fs/issues/detail?id=12
-
---- Makefile.am
-+++ Makefile.am
-@@ -35,9 +35,5 @@
- 
- if LINUX
- install-exec-hook:
--	cd /sbin && \
--	rm -f mount.rar2fs && \
--	$(LN_S) $(DESTDIR)$(bindir)/rar2fs mount.rar2fs
-+	$(LN_S) rar2fs $(DESTDIR)$(bindir)/mount.rar2fs
- endif
--
--
diff --git a/sys-fs/rar2fs/files/rar2fs-1.16.0_p20130509-destdir.patch b/sys-fs/rar2fs/files/rar2fs-1.16.0_p20130509-destdir.patch
deleted file mode 100644
index ce5b3e28c8bb..000000000000
--- a/sys-fs/rar2fs/files/rar2fs-1.16.0_p20130509-destdir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://code.google.com/p/rar2fs/issues/detail?id=12#c16
-
---- configure.ac
-+++ configure.ac
-@@ -26,6 +26,7 @@
- 
- AM_PROG_CC_C_O
- AC_PROG_CXX
-+AC_PROG_MKDIR_P
- 
- AC_USE_SYSTEM_EXTENSIONS
- AX_C_BIGENDIAN_CROSS
---- Makefile.am
-+++ Makefile.am
-@@ -35,6 +35,7 @@
- 
- if LINUX
- install-exec-hook:
-+	$(MKDIR_P) $(DESTDIR)$(sbindir)
- 	rm -f $(DESTDIR)$(sbindir)/mount.rar2fs && \
- 	$(LN_S) $(bindir)/rar2fs $(DESTDIR)$(sbindir)/mount.rar2fs
- 
diff --git a/sys-fs/rar2fs/rar2fs-1.16.0.ebuild b/sys-fs/rar2fs/rar2fs-1.16.0.ebuild
deleted file mode 100644
index b7242d1cfa4e..000000000000
--- a/sys-fs/rar2fs/rar2fs-1.16.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/rar2fs/rar2fs-1.16.0.ebuild,v 1.3 2013/05/09 18:16:03 ssuominen Exp $
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A FUSE based filesystem that can mount one or multiple RAR archive(s)"
-HOMEPAGE="http://code.google.com/p/rar2fs/"
-SRC_URI="http://rar2fs.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="=app-arch/unrar-4.2*:=
-	sys-fs/fuse"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-destdir.patch
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	export USER_CFLAGS="${CFLAGS}"
-
-	local mydebug
-	use debug && mydebug="--enable-debug=4"
-
-	econf \
-		--with-unrar=/usr/include/libunrar \
-		${mydebug}
-}
diff --git a/sys-fs/rar2fs/rar2fs-1.16.0_p20130509.ebuild b/sys-fs/rar2fs/rar2fs-1.16.0_p20130509.ebuild
deleted file mode 100644
index e6e108dc16b6..000000000000
--- a/sys-fs/rar2fs/rar2fs-1.16.0_p20130509.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/rar2fs/rar2fs-1.16.0_p20130509.ebuild,v 1.1 2013/05/09 18:16:03 ssuominen Exp $
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A FUSE based filesystem that can mount one or multiple RAR archive(s)"
-HOMEPAGE="http://code.google.com/p/rar2fs/"
-SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz"
-#SRC_URI="http://rar2fs.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=app-arch/unrar-5:=
-	sys-fs/fuse"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS ChangeLog"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-destdir.patch
-	eautoreconf
-}
-
-src_configure() {
-	export USER_CFLAGS="${CFLAGS}"
-
-	local mydebug
-	use debug && mydebug="--enable-debug=4"
-
-	econf \
-		--with-unrar=/usr/include/libunrar \
-		${mydebug}
-}