6 files changed, 13 insertions, 126 deletions
diff --git a/sys-fs/s3fs/ChangeLog b/sys-fs/s3fs/ChangeLog
index 07f76b7b2a3b..ba100cb72e3e 100644
--- a/sys-fs/s3fs/ChangeLog
+++ b/sys-fs/s3fs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/s3fs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/s3fs/ChangeLog,v 1.12 2011/08/31 05:00:09 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/s3fs/ChangeLog,v 1.13 2011/08/31 05:06:24 radhermit Exp $
+
+  31 Aug 2011; Tim Harder <radhermit@gentoo.org> -s3fs-0_p177-r1.ebuild,
+  -files/s3fs-0_p177-asneeded.patch, -s3fs-1.33.ebuild, -s3fs-1.40.ebuild:
+  Remove old.
 
 *s3fs-1.61 (31 Aug 2011)
 
diff --git a/sys-fs/s3fs/Manifest b/sys-fs/s3fs/Manifest
index 0c3065de9b4b..77d2e83107cd 100644
--- a/sys-fs/s3fs/Manifest
+++ b/sys-fs/s3fs/Manifest
@@ -1,26 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX s3fs-0_p177-asneeded.patch 499 RMD160 e2da76fe38ea5615a1d1b5829089f782db48b1cc SHA1 e87224ae3c066952b6bc5683cd8daf73239e2151 SHA256 e2a0b95d3a9c39dfa3b07a345b0d45db475dfa4330fad127c92d2d25ba48463f
-DIST s3fs-1.33.tar.gz 144987 RMD160 da259621ba5a75609d7a66aa7dd523fcbc7bf161 SHA1 24e25e23f8ebddcc92358f796a403197e57f62ef SHA256 1318a6b68667f0ec83bd7ef12080081ed6afd42b377f786abaf37a6f870859fc
-DIST s3fs-1.40.tar.gz 153570 RMD160 a1aa2c2afe81ebe5ce98d7b7fcf26082626ec6a1 SHA1 d20c04ed1d277a24013c4140a988892c4e8f8012 SHA256 5def724a0c0a56b82cfdf7e265303a50734f5f97068ea10cc4ff5869aabb3ce1
 DIST s3fs-1.61.tar.gz 155699 RMD160 582c193888466341ecf0cc6472dd2a2b5e3eb803 SHA1 8f6561ce00b41c667b738595fdb7b42196c5eee6 SHA256 47e6700c9ec65f85cc1eeb004dcf33b4533b3415466107f310fe167f49f35ec5
 DIST s3fs-r177-source.tar.gz 18145 RMD160 10d070af3112e233fd9f78447e3b5e6913116147 SHA1 50b6b8924134ddd818f3b0dd60497d2b32303df2 SHA256 fbbaa0de79fa8bfbda5345ff9873fa8bfe773b13e7f8a3926b8a11447e3ff255
-EBUILD s3fs-0_p177-r1.ebuild 795 RMD160 a617a595fd258d08e3fc3df12f95744ebfd71e88 SHA1 66f902b164fe9dd4d0dddfdc7eb9770d27d2ad95 SHA256 263a06aecf9d6899d6b9a17813568f827e405cfc0d5fd201fc3ee266ce40a790
 EBUILD s3fs-0_p177.ebuild 641 RMD160 01749509d2be3237fc2484cc1519cf00dfbf5c32 SHA1 78a1db3e1ccf807f1131a19c5059b3d909eb2fce SHA256 4ee10d47f451294b8d8b404277ec3f94e69f0f2b76f69222281283ef4905c39f
-EBUILD s3fs-1.33.ebuild 679 RMD160 c8fba677223fafa455107f0725c7596e29c63327 SHA1 0b7f2dbe610fd5feddfa728bd050193713dcbb77 SHA256 7a7b00d3369097b06c9a5f5ad04a8dacbef2829d69c77ede1f0dcbfeaac2de67
-EBUILD s3fs-1.40.ebuild 679 RMD160 7a76ec196251b5d004fc12f9719020f57ce9733a SHA1 1e952375e1834f201da9d9814ee00aae9a806ca6 SHA256 8b8b2df5316befbc69451300c9c1a69d3f5f42f21c711a933ecb52d54407ffc4
 EBUILD s3fs-1.61.ebuild 635 RMD160 a9cccdded2b602a70890a2381f005990c686e81c SHA1 ac3b191590e4df14890cc7ce058f6204aa536cec SHA256 a49e620d5b5e10d9f5da322d9cead0ae0446a68c6d8e52c21fcac52c9315001e
-MISC ChangeLog 2150 RMD160 fc65dee2990745e709c60eda814e64a71a73a40d SHA1 89d39948758f268e5c83c7624dca91bfd8f7d1f7 SHA256 62b12442086b3122eceb11d84ff91b9d068acdbbd65c537d02a9bf5ab51cb728
+MISC ChangeLog 2313 RMD160 b3d7ed6aa49f68e1afea669755f97faa6cc68338 SHA1 bad62be80183a57fac48c43e1069b16fd819eafe SHA256 e09f12a30c72b9a28b7bc937ad3010c681fa87e71e82d75e8d3076009d1f30e6
 MISC metadata.xml 369 RMD160 fd78a72a82f89ef877e2fdea2e00b42289ec2d33 SHA1 5f5b6e655dd6428d80b9b7362e303181eff09586 SHA256 6bb9a22be579ebb97c892b2f3e80820ed51d97ff4c95003e99875b97bc840712
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOXb/eAAoJEEqz6FtPBkyj/tkIAJfJsqfQPivx/tnnZ/JSXZ17
-Fv0M8ya2j+2g+dPFwUXWFa9PLemdgqwFbd5CltCyDNcKGy9PDNBPAwOhZQZOjP2g
-0x4VMbii58ymbc9LQ0BB6mOq1o3QjgcFtmdL7xHCL4e/uCAV6EppjUOFkHA41bJt
-/zcrqy8AYaYz2Jh7+fhSLuBx4zj1kdFqY+59ooIA4PU3IhkVnCw0kep44JPoppmq
-usBJYJIJL7v9tKJnHNtVobT7j+SxCRwVAzb46fbtd9zo8hSsY0TD4jOrMI3GRsbx
-eZHgU0wffRV1CRHBlK3PyolkyIf1lVxHnkiIaqJmqdvk7FMkWzPqGEgZ5d2Zn9c=
-=hcsa
+iQEcBAEBCgAGBQJOXcFWAAoJEEqz6FtPBkyjdH4H/2PjPiji+MbhHuEdMxvv0Au2
+b/TgEnYOQNSl/mn99qfjdAU9vvMmvnUiaUx8dmLZIOOmYEPdTHURx/e/tE5gtPd8
+3VzqaEwLFPUtvCEYw7714HmJKcmbkRw24D/y0QKNYoRmFpUET9z1CPZk82MxIV5r
+T99tURBxpKBsnUtgo6FdTwZdgQvSXnJ5OLDZQPOsn3QrN7LngfQ9cMflzmJFRJIw
+HMuaJ0ObuYiCvYeoq3Of3xmAW8lxtuXEjHHuOo+HKgBTZoUAtFqnwVGIR619hBYX
+dQTnl3w0mRPlMyc2BftqvlH/86TH1wY1Jqt/eV1109AEPRUUgIcKchTv6woVVIA=
+=+wsX
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/s3fs/files/s3fs-0_p177-asneeded.patch b/sys-fs/s3fs/files/s3fs-0_p177-asneeded.patch
deleted file mode 100644
index b39fb83ad904..000000000000
--- a/sys-fs/s3fs/files/s3fs-0_p177-asneeded.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/Makefile	2008-05-19 19:34:38.000000000 +0200
-+++ b/Makefile	2009-10-19 22:10:55.810129401 +0200
-@@ -1,5 +1,5 @@
- all:
--	g++ -ggdb -Wall $(shell pkg-config fuse --cflags --libs) $(shell pkg-config libcurl --cflags --libs) $(shell xml2-config --cflags --libs) -lcrypto s3fs.cpp -o s3fs
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) s3fs.cpp -o s3fs  $(shell pkg-config fuse --cflags --libs) $(shell pkg-config libcurl --cflags --libs) $(shell xml2-config --cflags --libs) -lcrypto
- 	@echo ok!
- 
- install: all
diff --git a/sys-fs/s3fs/s3fs-0_p177-r1.ebuild b/sys-fs/s3fs/s3fs-0_p177-r1.ebuild
deleted file mode 100644
index 37893b59bfbb..000000000000
--- a/sys-fs/s3fs/s3fs-0_p177-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/s3fs/s3fs-0_p177-r1.ebuild,v 1.1 2011/01/05 01:01:41 xmw Exp $
-
-inherit eutils toolchain-funcs
-
-MY_PV="r177-source"
-
-DESCRIPTION="Amazon mounting S3 via fuse"
-HOMEPAGE="http://s3fs.googlecode.com/"
-SRC_URI="http://s3fs.googlecode.com/files/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-DEPEND=">=net-misc/curl-7.17.1
-	>=sys-fs/fuse-2.6.0
-	dev-libs/libxml2
-	dev-libs/openssl"
-
-RDEPEND="${DEPEND}
-	app-misc/mime-types"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX)" || die
-}
-
-src_install() {
-	dobin s3fs || die
-}
diff --git a/sys-fs/s3fs/s3fs-1.33.ebuild b/sys-fs/s3fs/s3fs-1.33.ebuild
deleted file mode 100644
index 4f5817ffce3d..000000000000
--- a/sys-fs/s3fs/s3fs-1.33.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/s3fs/s3fs-1.33.ebuild,v 1.2 2011/05/10 08:23:41 xmw Exp $
-
-EAPI=2
-
-inherit toolchain-funcs
-
-DESCRIPTION="Amazon mounting S3 via fuse"
-HOMEPAGE="http://s3fs.googlecode.com/"
-SRC_URI="http://s3fs.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/libxml2-2.6
-	dev-libs/openssl
-	>=net-misc/curl-7.0
-	>=sys-fs/fuse-2.8.4"
-
-RDEPEND="${DEPEND}
-	app-misc/mime-types"
-
-RESTRICT=test
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README || die
-}
diff --git a/sys-fs/s3fs/s3fs-1.40.ebuild b/sys-fs/s3fs/s3fs-1.40.ebuild
deleted file mode 100644
index 4aeca0a316d0..000000000000
--- a/sys-fs/s3fs/s3fs-1.40.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/s3fs/s3fs-1.40.ebuild,v 1.1 2011/05/10 08:23:41 xmw Exp $
-
-EAPI=2
-
-inherit toolchain-funcs
-
-DESCRIPTION="Amazon mounting S3 via fuse"
-HOMEPAGE="http://s3fs.googlecode.com/"
-SRC_URI="http://s3fs.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/libxml2-2.6
-	dev-libs/openssl
-	>=net-misc/curl-7.0
-	>=sys-fs/fuse-2.8.4"
-
-RDEPEND="${DEPEND}
-	app-misc/mime-types"
-
-RESTRICT=test
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README || die
-}