version bump, remove old

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0x65E309F2189DB0B8)

7 files changed, 50 insertions, 233 deletions

diff --git a/app-portage/mirrorselect/ChangeLog b/app-portage/mirrorselect/ChangeLog
index 16c406a57a6c..cc8859c755d6 100644
--- a/app-portage/mirrorselect/ChangeLog
+++ b/app-portage/mirrorselect/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-portage/mirrorselect
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/ChangeLog,v 1.132 2014/05/03 20:59:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/ChangeLog,v 1.133 2014/05/05 04:32:29 dolsen Exp $
+
+*mirrorselect-2.2.1 (05 May 2014)
+
+  05 May 2014; Brian Dolbec <dolsen@gentoo.org> +mirrorselect-2.2.1.ebuild,
+  mirrorselect-9999.ebuild, -files/0001-Fix-rsync-mirror-selection.patch,
+  -files/0002-Check-for-a-valid-mirrorselect-test-file.patch,
+  -files/2.2.0-Fix-setup.py-PVR.patch,
+  -files/2.2.0-Ignore-inaccessible-fsmirrors.patch:
+  Version bump. Remove old versions. Update homepage link.
 
   03 May 2014; Mike Gilbert <floppym@gentoo.org> mirrorselect-2.2.0.1.ebuild,
   mirrorselect-9999.ebuild:
diff --git a/app-portage/mirrorselect/files/0001-Fix-rsync-mirror-selection.patch b/app-portage/mirrorselect/files/0001-Fix-rsync-mirror-selection.patch
deleted file mode 100644
index a612ffe81ba7..000000000000
--- a/app-portage/mirrorselect/files/0001-Fix-rsync-mirror-selection.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From daad8a5e5ea2dac503513f6ab114184dd427db01 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Fri, 2 Apr 2010 16:44:14 +0200
-Subject: [PATCH] Fix rsync mirror selectection
-
-Append /gentoo-portage to the rsync mirror url if necessary, bug 312753,
-	   thanks to Donald Wallace Rouse II <gentoo-user-0d329vjsd8@dwr2.org>
----
- main.py |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/main.py b/main.py
-index 367e8d4..dd3386e 100755
---- a/main.py
-+++ b/main.py
-@@ -608,6 +608,8 @@ class Interactive(object):
- 
- 		for (url, args) in sorted(hosts, key = lambda x: (x[1]['country'].lower(), x[1]['name'].lower()) ):
- 			marker = ""
-+			if options.rsync and not url.endswith("/gentoo-portage"):
-+				url+="/gentoo-portage"
- 			if (not options.ipv6 and not options.ipv4) and args['ipv6'] == 'y':
- 				marker = "* "
- 			if options.ipv6 and ( args['ipv6'] == 'n' ): continue
--- 
-1.7.0.4
-
diff --git a/app-portage/mirrorselect/files/0002-Check-for-a-valid-mirrorselect-test-file.patch b/app-portage/mirrorselect/files/0002-Check-for-a-valid-mirrorselect-test-file.patch
deleted file mode 100644
index 864aaa7aa03d..000000000000
--- a/app-portage/mirrorselect/files/0002-Check-for-a-valid-mirrorselect-test-file.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 88521c86907819486e0e18bffcb1674ae180341e Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Sun, 1 Aug 2010 21:35:11 +0200
-Subject: [PATCH] Check for a valid mirrorselect-test file, fixes bug 330611, thanks to Soren Harward <stharward@gmail.com>.
-
----
- main.py |   17 +++++++----------
- 1 files changed, 7 insertions(+), 10 deletions(-)
-
-diff --git a/main.py b/main.py
-index dd3386e..f5f35be 100755
---- a/main.py
-+++ b/main.py
-@@ -36,6 +36,7 @@ import sys
- import time
- import urllib
- import urlparse
-+import hashlib
- from optparse import IndentedHelpFormatter, OptionParser
- from mirrorselect.mirrorparser3 import MirrorParser3, MIRRORS_3_XML, MIRRORS_RSYNC_DATA
- import codecs
-@@ -336,8 +337,6 @@ class Shallow(object):
- class Deep(object):
- 	"""handles deep mode mirror selection."""
- 
--	_bufsize = 4096
--
- 	def __init__(self, hosts, options):
- 		self.urls = []
- 		self._hosts = hosts
-@@ -457,10 +456,9 @@ class Deep(object):
- 
- 		for ip in ips:
- 			try:
--				ip_url = url.replace(url_parts.hostname, ip, 1)
- 				try:
- 					signal.alarm(self._connect_timeout)
--					f = urllib.urlopen(ip_url)
-+					f = urllib.urlopen(url)
- 					break
- 				finally:
- 					signal.alarm(0)
-@@ -480,14 +478,12 @@ class Deep(object):
- 			return (None, True)
- 
- 		try:
--
- 			# Close the initial "wake up" connection.
- 			try:
- 				signal.alarm(self._connect_timeout)
- 				f.close()
- 			finally:
- 				signal.alarm(0)
--
- 		except EnvironmentError, e:
- 			output.write(('deeptime(): close connection to host %s ' + \
- 				'failed for ip %s: %s\n') % \
-@@ -498,16 +494,17 @@ class Deep(object):
- 				(url_parts.hostname, ip), 2)
- 
- 		try:
--
- 			# The first connection serves to "wake up" the route between
- 			# the local and remote machines. A second connection is used
- 			# for the timed run.
- 			try:
- 				signal.alarm(int(math.ceil(maxtime)))
- 				stime = time.time()
--				f = urllib.urlopen(ip_url)
--				while f.read(self._bufsize):
--					pass
-+				f = urllib.urlopen(url)
-+
-+				if hashlib.md5(f.read()).hexdigest() != "bdf077b2e683c506bf9e8f2494eeb044":
-+					return (None, True)
-+
- 				delta = time.time() - stime
- 				f.close()
- 			finally:
--- 
-1.7.1
-
diff --git a/app-portage/mirrorselect/files/2.2.0-Fix-setup.py-PVR.patch b/app-portage/mirrorselect/files/2.2.0-Fix-setup.py-PVR.patch
deleted file mode 100644
index 86268109b7ea..000000000000
--- a/app-portage/mirrorselect/files/2.2.0-Fix-setup.py-PVR.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From bc0efc857b5708ea572e3a4c57c9689cf48c50ad Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Sat, 15 Dec 2012 20:48:17 -0800
-Subject: [PATCH] Fix setup.py to use PVR instead of VERSION from the
- environment so that egg-info is set correctly during the
- merge.
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 8a9f980..7a53076 100755
---- a/setup.py
-+++ b/setup.py
-@@ -12,7 +12,7 @@ import os
- import io
-
-
--__version__ = os.getenv('VERSION', default='9999')
-+__version__ = os.getenv('VERSION', default=os.getenv('PVR', default='9999'))
-
- cwd = os.getcwd()
-
---
-1.8.0
-
diff --git a/app-portage/mirrorselect/files/2.2.0-Ignore-inaccessible-fsmirrors.patch b/app-portage/mirrorselect/files/2.2.0-Ignore-inaccessible-fsmirrors.patch
deleted file mode 100644
index 01c97886d48f..000000000000
--- a/app-portage/mirrorselect/files/2.2.0-Ignore-inaccessible-fsmirrors.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 362ba4585a48273289f382c16947e858ff3818cf Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Sat, 15 Dec 2012 18:37:50 -0800
-Subject: [PATCH] Add aditional debug info, fix bug 373195, removing garbage
- or otherwise inaccessible file system mirrors from existing
- SYNC or GENTOO_MIRRORS make.conf values.
-
----
- mirrorselect/main.py      | 14 +++++++++++---
- mirrorselect/selectors.py |  4 +++-
- 2 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/mirrorselect/main.py b/mirrorselect/main.py
-index cbff890..48d74a7 100755
---- a/mirrorselect/main.py
-+++ b/mirrorselect/main.py
-@@ -154,8 +154,7 @@ class MirrorSelect(object):
- 		sys.exit(0)
-
-
--	@staticmethod
--	def get_filesystem_mirrors(config_path, sync=False):
-+	def get_filesystem_mirrors(self, config_path, sync=False):
- 		"""Read the current mirrors and retain mounted filesystems mirrors
-
- 		@param config_path: string
-@@ -170,6 +169,7 @@ class MirrorSelect(object):
- 		else:
- 			var = 'GENTOO_MIRRORS'
-
-+		self.output.write('get_filesystem_mirrors(): config_path = %s\n' % config_path, 2)
- 		try:
- 			f = open(config_path,'r')
- 		except IOError:
-@@ -182,6 +182,8 @@ class MirrorSelect(object):
- 			lex.quotes = "\"'"
- 			while 1:
- 				key = lex.get_token()
-+				#self.output.write('get_filesystem_mirrors(): processing key = %s\n' % key, 2)
-+
- 				if key == var:
- 					equ = lex.get_token()
-
-@@ -196,16 +198,22 @@ class MirrorSelect(object):
-
- 					""" Look for mounted filesystem in value """
- 					mirrorlist = val.rsplit()
-+					self.output.write('get_filesystem_mirrors(): mirrorlist = %s\n' % mirrorlist, 2)
- 					p = re.compile('rsync://|http://|ftp://', re.IGNORECASE)
- 					for mirror in mirrorlist:
- 						if (p.match(mirror) == None):
--							fsmirrors.append(mirror)
-+							if os.access(mirror, os.F_OK):
-+								self.output.write('get_filesystem_mirrors(): found file system mirror = %s\n' % mirror, 2)
-+								fsmirrors.append(mirror)
-+							else:
-+								self.output.write('get_filesystem_mirrors(): ignoring non-accessible mirror = %s\n' % mirror, 2)
- 					break
- 				elif key is None:
- 					break
- 		except Exception:
- 			fsmirrors = []
-
-+		self.output.write('get_filesystem_mirrors(): fsmirrors = %s\n' % fsmirrors, 2)
- 		return fsmirrors
-
-
-diff --git a/mirrorselect/selectors.py b/mirrorselect/selectors.py
-index b2a5fc7..38ca07a 100644
---- a/mirrorselect/selectors.py
-+++ b/mirrorselect/selectors.py
-@@ -303,14 +303,16 @@ class Deep(object):
-
- 		self.output.write('\n')	#this just makes output nicer
-
--		#can't just return the dict.valuse, because we want the fastest mirror first...
-+		#can't just return the dict.values, because we want the fastest mirror first...
- 		keys = list(top_hosts.keys())
- 		keys.sort()
-
- 		rethosts = []
- 		for key in keys:
-+			#self.output.write('deeptest(): adding rethost %s, %s' % (key, top_hosts[key]), 2)
- 			rethosts.append(top_hosts[key])
-
-+		self.output.write('deeptest(): final rethost %s' % (rethosts), 2)
- 		self.urls = rethosts
-
-
---
-1.8.0
-
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.1.ebuild
new file mode 100644
index 000000000000..498e785d7184
--- /dev/null
+++ b/app-portage/mirrorselect/mirrorselect-2.2.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-2.2.1.ebuild,v 1.1 2014/05/05 04:32:29 dolsen Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils distutils-r1 prefix
+
+DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Mirrorselect"
+SRC_URI="http://dev.gentoo.org/~dolsen/releases/mirrorselect/${P}.tar.gz
+	http://dev.gentoo.org/~dolsen/releases/mirrorselect/mirrorselect-test
+	"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-util/dialog
+	net-analyzer/netselect
+	dev-python/ssl-fetch
+	"
+
+python_prepare_all()  {
+	python_export_best
+	eprefixify setup.py mirrorselect/main.py
+	echo Now setting version... VERSION="${PVR}" "${PYTHON}" setup.py set_version
+	VERSION="${PVR}" "${PYTHON}" setup.py set_version || die "setup.py set_version failed"
+	distutils-r1_python_prepare_all
+}
diff --git a/app-portage/mirrorselect/mirrorselect-9999.ebuild b/app-portage/mirrorselect/mirrorselect-9999.ebuild
index 486dd13fda92..f8f09d006a3e 100644
--- a/app-portage/mirrorselect/mirrorselect-9999.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-9999.ebuild,v 1.7 2014/05/03 20:59:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/mirrorselect/mirrorselect-9999.ebuild,v 1.8 2014/05/05 04:32:29 dolsen Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/mirrorselect.git"
 EGIT_MASTER="master"
 
 DESCRIPTION="Tool to help select distfiles mirrors for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/tools/index.xml"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Mirrorselect"
 SRC_URI=""
 
 LICENSE="GPL-2"
@@ -40,6 +40,6 @@ pkg_postinst() {
 	distutils-r1_pkg_postinst
 
 	einfo "This is a development version."
-	einfo "Please report any bugs you encounter."
-	einfo "http://bugs.gentoo.org/"
+	einfo "Please report any bugs you encounter to:"
+	einfo "https://bugs.gentoo.org/"
 }