version bump

Package-Manager: portage-2.2.0_alpha101/cvs/Linux i686

5 files changed, 236 insertions, 20 deletions

diff --git a/net-proxy/http-replicator/ChangeLog b/net-proxy/http-replicator/ChangeLog
index ca6a802cae37..a969a8b8e1df 100644
--- a/net-proxy/http-replicator/ChangeLog
+++ b/net-proxy/http-replicator/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/http-replicator
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/ChangeLog,v 1.30 2009/06/09 20:30:18 jer Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/ChangeLog,v 1.31 2012/05/04 01:35:08 ottxor Exp $
+
+*http-replicator-3.0-r3 (04 May 2012)
+
+  04 May 2012; Christoph Junghans <ottxor@gentoo.org>
+  -http-replicator-3.0-r1.ebuild, +http-replicator-3.0-r3.ebuild,
+  +files/http-replicator-3.0-repcacheman-0.44-r2,
+  files/http-replicator-3.0.conf:
+  version bump
 
   09 Jun 2009; Jeroen Roovers <jer@gentoo.org>
   http-replicator-3.0-r2.ebuild:
diff --git a/net-proxy/http-replicator/Manifest b/net-proxy/http-replicator/Manifest
index d73022aaf4ce..4c25e0eadf1b 100644
--- a/net-proxy/http-replicator/Manifest
+++ b/net-proxy/http-replicator/Manifest
@@ -4,18 +4,23 @@ Hash: SHA1
 AUX http-replicator-3.0-callrepcacheman-0.1 86 RMD160 ccd133c228f7e0ee08ce32842bcdcf80d6f1122e SHA1 2587f07d9beb03cc641b69f9eb97516670e8e085 SHA256 9f7cff787b49eb8cb6ca4581c77167b305a766785a0897ee663ca94cf3aa97fd
 AUX http-replicator-3.0-repcacheman-0.44 5327 RMD160 5545856f99674ff7bb7aedd946284904e525d6f2 SHA1 8168528d7062ff00b6a9189b5ab8d6651b76155a SHA256 28d45098bf29ce050aa94b47c9a5fee28f5f083a8bf213f90044881092125bbe
 AUX http-replicator-3.0-repcacheman-0.44-r1 5327 RMD160 dcd027455847c343040d78c104b98fd2d7b19edc SHA1 c1d669011cd3518d4a54f96e149498b7fcdd8e79 SHA256 a2e9ac07976c83f4e4280dabe69546476bd7c58fd6f503f94d84618fb5fb5ca7
+AUX http-replicator-3.0-repcacheman-0.44-r2 5337 RMD160 d4407807d3b2a7a98493d298efeed0cb6c48b75c SHA1 8d066a421506d069bc85eb6538bf75e485f8d7a4 SHA256 173c59c14f3a7c3a143e33b98a408e46f27cbc361ccd9f28bd47187b7ff55a04
 AUX http-replicator-3.0-sighup.patch 993 RMD160 1b308fda22c0d2dcfcd9a80bc4adcbf5e4197bd0 SHA1 e8bd0d332b0bb99882af20bfb06e72a1eebd9478 SHA256 eccf5e7b0e77906624a83214c5e652bc8cce463ddf7365ab9b13302dfb2ff352
-AUX http-replicator-3.0.conf 1703 RMD160 e19f0a09ceee797b0839e69efa9a9c080193786c SHA1 d6643b7ccc4e754193cb5dcd5f3fba38f6b7657d SHA256 7e44944e51b6c3fdde6bdc610e0d09d43a8e27fb41d97c37917a7150f144fad4
+AUX http-replicator-3.0.conf 1704 RMD160 15e159944cbb652466a84b64c9abcaa0a8987b8a SHA1 15c169854fc21b64289db6d108261ca7a9b46caa SHA256 8b6acbf87ffbda0cdb51167ab2bd6a665374c553fe52fe2717d8be03e0e7cb65
 AUX http-replicator-3.0.init 762 RMD160 03e486936fd711a8cf9bfd629407d9a120e579fd SHA1 4c0ee55a4d3cba72499fe9fbb8a0c92c5c02ba47 SHA256 63e64c4e55b3395619aab3fa3154255d36144af371d4ea0789884148845e2cdb
 DIST http-replicator_3.0.tar.gz 39291 RMD160 b40b6839fb77fca25b500b3b3a3a1cb596feca4d SHA1 2e6af7d51b7e45356e0e12d9ac97739c079f3e14 SHA256 cd5b2c8b4b6da4fd5a9313cd5e7d4179805002f2de5fd25a42301df4f5bd161e
-EBUILD http-replicator-3.0-r1.ebuild 1985 RMD160 47e6e581a8ce1c9a85db06805de3c1516781d457 SHA1 90e277f94b078032a5db349e0279767eefb576d9 SHA256 0bf73d70f88ff79b0d1dfdb03f6603b993a08f75ab08c8880615667fb392318a
 EBUILD http-replicator-3.0-r2.ebuild 1998 RMD160 52d9d93e7a24c49d0ef0ba4193f30d22a4cb2a88 SHA1 bc2fb4d3c0e303f37345c9f2045079c625c163c0 SHA256 0bd74ead0d6addf755fb865360b7748b1729bb295a577353c5f0f9ba48fd638f
-MISC ChangeLog 5490 RMD160 85c506f301e7d6ae7260cca12625695a42454cf4 SHA1 c08c73d14fe1a20fbdcffcc042256fb366015481 SHA256 e1fed68e25c06bb51d589c9a8d7da75ec8c00f7c817f363cd6066a6607a806e6
+EBUILD http-replicator-3.0-r3.ebuild 2014 RMD160 3980db678148ab6e331abdd49ee86146a58581a6 SHA1 f4d3a35b1b9420637a69f92a789ba5d1314c0335 SHA256 b989a13161fffb9f4920625ba881aee7eefade48834fd101d54d1086ba89e789
+MISC ChangeLog 5752 RMD160 87bef8441fdae603f7832d23b1ec199e05e5ac79 SHA1 3e634f26993377153a7a4eaf47b32fc839ba950d SHA256 cdf4f7203a02987ae3ef4f6a169e52de1735293eb075c6b87429cf5dbd26f5e8
 MISC metadata.xml 162 RMD160 716ac381b435b87c3e905b6e4415183f3b782722 SHA1 a0e8485174b2c779b5fac5811b12dff14d9c3bd9 SHA256 7452c4deeae23532b16b9030c3b32a9a09a5f82faed0fd23810a83db174dc60f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkzRzboACgkQ9/cejkQaxBCYaACeP776TRhNPpj2gxvsaerFrEpg
-s28An0zr0Cz3KydgsBNUq9hFZgf7y+QS
-=Ln1g
+iQEcBAEBAgAGBQJPozJRAAoJEOeBhlrCAAWGipoIALYeDa4B8GznBKsASi/5UhR+
+XoQzhCrAcu95btng1E9/+uYcS7DnDw6Xy1dcEl9tJqD32f5fYxW/vkzo9FQJVkEi
+oGcwcvYNrp533mUrSw5hcmDGA6HHgvhnToI4jc4WC45BGKBr9JD9awGtkB8KaviL
+bkN+x8GxtR0UatcaZykP5/9OFRx0V+7YIxwuEqtW5qCv810fTi54lnEAQ1GoLedo
+nA8Ov2dnkohlbNee7ruf7OsdfMLFVoJdyLVKttZmgzl1UMdqI3z524gNWLSBgwqZ
+ngF2bXeqiUygIPRVyC4KmsjiH1v4ZRsF2R/COUBFtXeJOyHqhZWvXB3NmMQ+PV8=
+=hqDs
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/http-replicator/files/http-replicator-3.0-repcacheman-0.44-r2 b/net-proxy/http-replicator/files/http-replicator-3.0-repcacheman-0.44-r2
new file mode 100755
index 000000000000..35d0a9e39fa2
--- /dev/null
+++ b/net-proxy/http-replicator/files/http-replicator-3.0-repcacheman-0.44-r2
@@ -0,0 +1,201 @@
+#! /usr/bin/python
+#
+# repcacheman ver 0.44
+#
+# Cache Manager for Http-Replicator
+# deletes duplicate files in PORTDIR.
+# imports authenticated (checksum + listed in portage)
+# files from PORTDIR to replicator's cache directory.
+#
+# Uses portage to perform checksum and database functions.
+# All else, Copyright(C)2004-2007 Tom Poplawski (poplawtm@earthlink.net)
+# Distributed under the terms of the GNU General Public License v2
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+import portage.manifest
+import portage.checksum
+import portage.exception
+import portage
+import string
+import os
+import pwd,sys,optparse
+
+if os.getuid():
+	print"Must be root"
+	sys.exit(1)
+
+# Parse Options
+
+parser = optparse.OptionParser()
+parser.add_option('-d', '--dir', type='string', default="/var/cache/http-replicator", help='http-replicators cache DIR')
+parser.add_option('-u','--user', type='string', default="portage", help='http-replicator USER')
+options, args = parser.parse_args() # parse command line
+
+if options.user:
+	try:
+		uid=pwd.getpwnam(options.user)[2]
+		gid=pwd.getpwnam(options.user)[3]
+	except:
+		print "User \'" + options.user + "\' Doesn't exist on system - edit config or add user to system."
+		sys.exit(1)
+else:
+	print "Error\n\tunable to get USER from /etc/http-replicator.conf"
+	sys.exit(1)
+
+# dir is replicator's cache directory
+dir=options.dir+"/"
+
+if os.path.isdir(dir) :
+	newdir=0
+else :
+	print"\n\nBegin Http-Replicator Setup...."
+	try:
+		os.makedirs(dir)
+		print "\tcreated " + dir
+		newdir=1
+	except:
+		print "\tcreate " + dir + " failed"
+		print '\terror:', sys.exc_info()[1]
+		sys.exit(1)
+	try:
+		os.chown(dir,uid,gid)
+		print "\tchanged owner of " + dir + " to " + options.user 
+	except:
+		print "\tchange owner " + dir + " to " + options.user + " failed:"
+		print '\terror:', sys.exc_info()[1]
+
+print "\n\nReplicator's cache directory: " + dir
+
+# Import Portage settings
+
+distdir=portage.settings["DISTDIR"]+"/"
+if distdir:
+	print "Portage's DISTDIR: " + distdir
+else:
+	print"Unable to get Portage's DISTDIR"
+	sys.exit(1)
+
+# Start Work
+
+print "\nComparing directories...."
+
+# Create filecmp object
+import filecmp
+dc=filecmp.dircmp (distdir,dir,['cvs-src','git-src','hg-src','egit-src','.locks'])
+print "Done!"
+
+dupes=dc.common
+deleted=0
+
+if dupes:
+	print "\nDeleting duplicate file(s) in " + distdir
+
+	for s in dupes:
+		print s
+		try:
+			os.remove(distdir + s )
+			deleted +=1
+		except:
+			print "\tdelete " + distdir + s + " failed:"
+			print '\terror:', sys.exc_info()[1]
+
+	print "Done!"
+
+
+newfiles=dc.left_only
+nf=len(dc.left_only)
+
+if nf:
+	print "\nNew files in DISTDIR:"
+	for s in newfiles:
+		print s
+	print"\nChecking authenticity and integrity of new files..."
+	added=0
+	errors=0
+	badsum=0
+
+# search all packages 
+
+	for mycp in portage.db["/"]["porttree"].dbapi.cp_all():
+		manifest = portage.manifest.Manifest("/usr/portage/" + mycp , distdir)
+		if manifest == None:
+			portage.writemsg("Missing manifest: %s\n" % mycpv)
+
+		remove=[]
+		for file in newfiles:
+			if manifest.hasFile("DIST",file):
+				try:
+					myok, myreason = manifest.checkFileHashes("DIST",file)
+					
+					try:
+						os.rename(distdir+file,dir+file)
+						added += 1
+					except:
+						try:
+							import shutil
+							shutil.copyfile(distdir+file,dir+file)
+							added += 1
+							os.remove(distdir+file)
+						except:
+							print "\tmove/copy " + file + " failed:"
+							print '\terror:', sys.exc_info()[1]
+							errors+=1
+							
+					try:
+						os.chown(dir+file,uid,gid)
+					except:
+						print "\tchown " + file + " failed:"
+						print '\terror:', sys.exc_info()[1]
+						errors +=1
+						
+					remove.append( file )
+					
+				except portage.exception.DigestException, e:
+					print("\n!!! Digest verification failed:")
+					print("!!! %s" % e.value[0])
+					print("!!! Reason: %s" % e.value[1])
+					print("!!! Got: %s" % e.value[2])
+					print("!!! Expected: %s" % e.value[3])
+					badsum+=1
+		if remove:
+			for rf in remove:
+				newfiles.remove ( rf )
+
+
+print "\nSUMMARY:"
+print "Found " + str(len(dupes)) + " duplicate file(s)"
+if deleted:
+	print "\tDeleted " + str(deleted) + " dupe(s)"
+
+if nf:
+	print "Found " + str(nf) + " new file(s)"
+	print "\tAdded " + str(added) + " of those file(s) to the cache"
+	
+	print "Rejected " +str(len(newfiles))  + " File(s) - ",
+	print str(badsum) +  " failed checksum(s)"
+	for s in newfiles:
+		print "\t%s" %s
+	if errors:
+		print "Encountered " +str(errors) + " errors"
+#	if badsum:
+#		print str(badsum) + " partial/corrupted file(s)"
+
+if newdir:
+	print"\n\nexecute:\n/etc/init.d/http-replicator start"
+	print"to run http-replicator.\n\nexecute:\nrc-update add http-replicator default"
+	print"to make http-replicator start at boot"
+	print"\n\nexecute:\n/usr/bin/repcacheman\nafter emerge's on the server to delete"
+	print"dup files and add new files to the cache"
+
+print "\n\nHTTP-Replicator requires you delete any partial downloads in " + distdir
+print "run rm -f " + distdir +'*'
+
diff --git a/net-proxy/http-replicator/files/http-replicator-3.0.conf b/net-proxy/http-replicator/files/http-replicator-3.0.conf
index 6dcc076ad9fd..35671fd262c0 100644
--- a/net-proxy/http-replicator/files/http-replicator-3.0.conf
+++ b/net-proxy/http-replicator/files/http-replicator-3.0.conf
@@ -24,7 +24,7 @@ DAEMON_OPTS="$GENERAL_OPTS"
 ## See PKDIR and PORTAGE_BINHOST settings in 'man make.conf'
 ## --alias /path/to/serve:location will make /path/to/serve
 ## browsable at http://http-replicator.com:port/location
-DAEMON_OPTS="$DAEMON_OPTS --alias /usr/portage/packages/All:All"
+DAEMON_OPTS="$DAEMON_OPTS --alias /usr/portage/packages:packages"
 
 ## Dir to hold the log file:
 DAEMON_OPTS="$DAEMON_OPTS --log /var/log/http-replicator.log"
diff --git a/net-proxy/http-replicator/http-replicator-3.0-r1.ebuild b/net-proxy/http-replicator/http-replicator-3.0-r3.ebuild
index 0c62717a17b2..87fc39ee9fac 100644
--- a/net-proxy/http-replicator/http-replicator-3.0-r1.ebuild
+++ b/net-proxy/http-replicator/http-replicator-3.0-r3.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/http-replicator-3.0-r1.ebuild,v 1.8 2009/01/20 22:44:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/http-replicator/http-replicator-3.0-r3.ebuild,v 1.1 2012/05/04 01:35:08 ottxor Exp $
 
-inherit eutils
+EAPI=4
+PYTHON_DEPEND="2:2.7:2.7" # not 2.6 bug #33907, not 3.0 bug #411083
+inherit eutils python
 
 MY_P="${PN}_${PV}"
 
@@ -13,10 +15,11 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ppc ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE=""
 
-DEPEND=">=dev-lang/python-2.3"
+DEPEND=""
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	epatch "${FILESDIR}/http-replicator-3.0-sighup.patch"
@@ -28,16 +31,15 @@ src_install(){
 	exeinto /usr/bin
 	doexe http-replicator
 	newexe "${FILESDIR}/http-replicator-3.0-callrepcacheman-0.1" repcacheman
-	if has_version '>=sys-apps/portage-2.2_rc6'; then
-		newexe "${FILESDIR}/http-replicator-3.0-repcacheman-0.44-r1" repcacheman.py
-	else
-		newexe "${FILESDIR}/http-replicator-3.0-repcacheman-0.44" repcacheman.py
-	fi
+	newexe "${FILESDIR}/http-replicator-3.0-repcacheman-0.44-r2" repcacheman.py
 
 	# init.d scripts
 	newinitd "${FILESDIR}/http-replicator-3.0.init" http-replicator
 	newconfd "${FILESDIR}/http-replicator-3.0.conf" http-replicator
 
+	# not 2.6 bug #33907, not 3.0 bug #411083
+	python_convert_shebangs -r 2.7 "${ED}"
+
 	# Docs
 	dodoc README debian/changelog