Remove old.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

5 files changed, 13 insertions, 227 deletions

diff --git a/www-misc/urlwatch/ChangeLog b/www-misc/urlwatch/ChangeLog
index 6f60ad28d5ae..e54234c83cc1 100644
--- a/www-misc/urlwatch/ChangeLog
+++ b/www-misc/urlwatch/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-misc/urlwatch
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/urlwatch/ChangeLog,v 1.7 2014/10/08 01:19:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/urlwatch/ChangeLog,v 1.8 2014/10/08 01:20:23 radhermit Exp $
+
+  08 Oct 2014; Tim Harder <radhermit@gentoo.org> -urlwatch-1.14.ebuild,
+  -urlwatch-1.15.ebuild, -files/urlwatch-xmpp.patch:
+  Remove old.
 
 *urlwatch-1.17 (08 Oct 2014)
 
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index 5ba498e6c331..517a8571000d 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,25 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX urlwatch-xmpp.patch 5701 SHA256 bbafcdd10005b1611074c839ce3cc206d3fe8ab0f790e50e063f327d6acf2013 SHA512 cd9db62e3694189a11c12f9965d187e358096e9d1bf4fd101f3e9222f1415fd763e092e5ac0afe9e4b79d6349c6da5de991995c40fb7c4629544b75ea1b397d7 WHIRLPOOL 8f4c15068f0c08748f657f74c2fb33e256e852c48f6429459a41d58e70f64fb23360a2d4f0672a0d1724092fc54141365a085498f991542f09223f1838bb77b9
-DIST urlwatch-1.14.tar.gz 12969 SHA256 00095dd0e2b09ab8b5ed4b5ae615c8e80484075219f8c81e05afd5777bb1a7ab
-DIST urlwatch-1.15.tar.gz 13159 SHA256 a2d4a985c58bbf9b1f86b3a3bd1e50d54d1f9e432e00b6dad38c457b3c6d2f90 SHA512 60b7904ec10fcc20c4d3096381d26c7baf0a4a3abe4aed0a9c7b6e5de74e212a8221279438ca0e3186966f9a9ba50138ce5cbe7564b155b2d4e7ffc17e94da1e WHIRLPOOL 5563ff35d4eb624fae514d6e1228b787f2daee6d121f3983eff2c50dfef39eae5485ddaae23dd85be4399e159af472a5caf9de5567000c3929ca580292a749fa
 DIST urlwatch-1.16.tar.gz 14416 SHA256 2e382100d6c72e739fcf66712e775854bfb53a06c2f27ebe01d5719540aac179 SHA512 d9b918fb90c457d8167543107abf59feca2857bfcde8192f6740b29988fe2f27f330a49f2656f0b769c70ce3642a097d6cb7f98f56b1d167d691c15465770b9d WHIRLPOOL d58e72982267a78958e7321034fe4217f0ac92c7900e0c90cffe2686472264da7d2e069706a668ac23df470749a2431f79ec1ad63d3b35b53035371fd520dc19
 DIST urlwatch-1.17.tar.gz 14647 SHA256 006f04c124cf3dace3d071921e5ed452f6fbd463495bc8aa7879b915407c88f6 SHA512 67026913083fcc99e99cfb33a31873ac48a2ee69db34b8c13fcccc3bdd051787954cfbf3d3ef73a331c03540e254f53ba6d2661967f89de204798aaf35033cd0 WHIRLPOOL 0cade08f009e4c71c6bd8e554f9d6e34d44fa4ff18a3b91c78317599f8e3df62d9dbe3cedd75d8f85478ba8b893c4d36b69965c074312d0ea04fce8c8ca132f3
-EBUILD urlwatch-1.14.ebuild 1058 SHA256 81724a0b12069cf7827f4168e8a01954f03132ff10173a342ba7eb3636ee8e29 SHA512 882d14b9550e2b11ceec08ce6b54dd6a9edbd3cd099d187ef7cadf55bd22dc4c249302ea912ba50edbf63ef38334b31a290b621bcabe38812971b1d75360837d WHIRLPOOL 4cbad32f536665a4558fb69295d5ef2e593333ec790aa8dda145a648a3427e27d64c86e7e12089209cacc19dab9218e0a88abeb496045f8eaed13b00b4ac9cfc
-EBUILD urlwatch-1.15.ebuild 1097 SHA256 bdf3f02d205ae49d33f47fbfa9b2d70123a5431aee7ba41b0c9ae9bd6c8baa59 SHA512 5f349ef6a499cf8f92280d997dc0f20f99309e7bba45e91ee3228545e0fdf1de1b0fae13cfcdd72f33e6fdfb66f699954fca5a2caac057fd42fc2445ec6717bc WHIRLPOOL 6a83b34571fcb30fc46473830f3241f99b24bd5de37e81ba76434cc9e3330f95521670c0be67be1f31605440317797ea4ce3f1597864574d1af53d23029a6dd0
 EBUILD urlwatch-1.16.ebuild 829 SHA256 8b2eaf9b3deb049e82818e0517d12b705461f1bd352039e9a96fa1d34c0853b0 SHA512 9d60815a6d5b31f1be0c3c5ab70fa4495a39e91e6360bd88fea191c09d64e3751884937e9131c8b1848d3877e218d373e2b203ebd97955dde02c863997c2bc6a WHIRLPOOL 830a5fe4eaee91e94639fd6e4c0ca90b4d3cebd74d0693ff4b92cba98f268cee6d329c5ea36b5bae7e9467d64f59f3a6d8d1c637146f59d470bfbe50b0f30d3b
 EBUILD urlwatch-1.17.ebuild 821 SHA256 85c4d2979644a96ac6ea3f3bdcc845a6f4140d85a22847fdbf0ddae9e7787af0 SHA512 6c617b1efedc2a9de3a0a8bff0dd8256f2e9ff2bbf83fb59c3f63ffcc85b3206246bf5028d7b6ff64d61cdb0798688f59d18fce91867c43d21677f2b961e457a WHIRLPOOL f7245e2ed3e11189c8b0030827805f2961d90347e9c07ae50da37249a79f12ecd70cd70b2c66b052685e21ee59bc632767a7b6358597876e0a864158289fe267
-MISC ChangeLog 1166 SHA256 817f5a7b77c6bf24e9ddd14a9c2d96d588727d6787a7d9f4ac1f779b819dbc46 SHA512 8e9c96dfdacc1dee786062e7783a979dd1b97fb785a79e692ebbf83f5532aaa3c4b273c297e9b14f7dac3be1c385cd6caedd05a84a40beac05dea1bdae6af6f2 WHIRLPOOL 3c3dc3d17004b6f57a3b63124dc7bceb532d3fb6d4887073a88a4c953578650f134c3b223dc1d2160a15d40f0dfb84b0a65887cc1e9f12f6ce1e1ae96f5fc803
+MISC ChangeLog 1306 SHA256 664926f42f495bbd423ca8c92e657a25e6570310e1d3a3cbe039926763fe70a8 SHA512 7d2371f4b612beace7c849214c9c0c053daad7d93a74b4cc79d74b2b2b476f813ed13c4cef9a85a05df929c1fbb92619f5b05e3294662115e46132c2f38fa815 WHIRLPOOL 468ec2ecd767e27482832be2028b033aadcb62cdde5d7d78b99c774e658c54c36a4ae5c8c1f1f4ae7bfe9343fa6f351ef17a9fda7f36f3fd57fb554c5c8def31
 MISC metadata.xml 303 SHA256 21611dcd66ea681efb5cb507d76c8adc810127448a247fbc8110a53a920a1945 SHA512 853fe511ea50c95f2a3737971dcc096e2590e2446fc1b41a6057941eec94a6af2aebfb541603d2b58573dbf9fe26fc879372772921e3f5a7bd397206d158f0c8 WHIRLPOOL 4cc94461a067533074357584ec3eceba31925d3c0dbfb920c2c442d310adc18a009253527538b87a87ea01d4d534d727fc350d5ecdc308e40b45646543a9c914
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUNJFTAAoJEEqz6FtPBkyjfQsH/191AtuEcfqqowzmZMvCFOv0
-2J6rJjLYo7knOaXyGehIyiFsrPFYrsq2z1YdQxsxw3HbIQaraK0i51unemtBkje4
-qLFhJlIYsHjtb5K2usUrcTzsw4pbDDF70I7TX5vcfxq5LZSxKuLLLMj2/jucwSLi
-tX59nfhZKiOmp/9lTawXcNLTzRyGEvGTsod2g7lejgt99xaQusdd8e87siyvOpeo
-A+0i86VRdhUcewkUyffcvN6dkP43qsXBauFhLe0fydyNamX4SDeodhp2BQQdwnks
-MAwAtFlfIkUchFK3ebNRJYF4817scGQlQtDTbmlSUU8RJKJGHbAXIu3b2gqyO+8=
-=zTU2
+iQEcBAEBCAAGBQJUNJF4AAoJEEqz6FtPBkyjnBcH+wdW2kjDE5Rs8rwBXlFty1Sj
+BJlECwUhzMA1j/i/OmUbiRw9e836Aid4YThzORQci96O128k9ODHk9bLJU+BeX+F
+JdhNWlFMwg1mGYkbvQDUNyqx23Zs/z0R5rVBVnPKqLmxCBV//kbAnCrlvgpqNKn8
+W2tTpcsGKX69IfuGODh6Gz8RTD+ilB/kFmXKDYffwAHs1LsS5mRGb8TvlKqMti+y
+pzYqEE9dh7+z42vU1EC1y4XYwPizR44RJrQRf8abZB7+l1FV6FFU6Vb8pj26uUic
+JvS3tkjcBaC+rW3JSWYQM8i1lbMQXlB/vtdAKPqM61vt8m0Wie3+vVs6+6193Kk=
+=hLcJ
 -----END PGP SIGNATURE-----
diff --git a/www-misc/urlwatch/files/urlwatch-xmpp.patch b/www-misc/urlwatch/files/urlwatch-xmpp.patch
deleted file mode 100644
index 6de100c06893..000000000000
--- a/www-misc/urlwatch/files/urlwatch-xmpp.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 96024c866daeeb9e6bdbde27cbed7f9f65f1bf24 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20D=C3=BCll=20(akurei)?= <akurei@furdev.org>
-Date: Sat, 20 Feb 2010 00:15:58 +0100
-Subject: [PATCH] Added xmpp functionality to v1.9
-
----
- urlwatch |   76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
- 1 files changed, 73 insertions(+), 3 deletions(-)
-
-diff --git a/urlwatch b/urlwatch
-index a59aeea..cffc5a7 100755
---- a/urlwatch
-+++ b/urlwatch
-@@ -55,6 +55,7 @@ urls_txt = os.path.join(urlwatch_dir, 'urls.txt')
- cache_dir = os.path.join(urlwatch_dir, 'cache')
- scripts_dir = os.path.join(urlwatch_dir, 'lib')
- hooks_py = os.path.join(scripts_dir, 'hooks.py')
-+xmpp_txt = os.path.join(urlwatch_dir, 'xmpp.txt')
- 
- # Check if we are installed in the system already
- (prefix, bindir) = os.path.split(os.path.dirname(os.path.abspath(sys.argv[0])))
-@@ -136,8 +137,10 @@ if __name__ == '__main__':
-     parser.add_option('', '--urls', dest='urls', metavar='FILE', help='Read URLs from the specified file')
-     parser.add_option('', '--hooks', dest='hooks', metavar='FILE', help='Use specified file as hooks.py module')
-     parser.add_option('-e', '--display-errors', action='store_true', dest='display_errors', help='Include HTTP errors (404, etc..) in the output')
-+    parser.add_option('-x', '--xmpp', action='store_true', dest='xmpp', help='Send a message to XMPP clients')
-+    parser.add_option('', '--xmpp-file', dest='xmpp_file', metavar='FILE', help='Read XMPP login data and recipients from [FILE] instead')
- 
--    parser.set_defaults(verbose=False, display_errors=False)
-+    parser.set_defaults(verbose=False, display_errors=False, xmpp=False)
- 
-     (options, args) = parser.parse_args(sys.argv)
- 
-@@ -171,6 +174,9 @@ if __name__ == '__main__':
-             log.error('%s is not a file' % options.hooks)
-             print 'Error: %s is not a file' % options.hooks
-             sys.exit(1)
-+    
-+    if options.xmpp_file:
-+        options.xmpp = True
- 
-     # Created all needed folders
-     for needed_dir in (urlwatch_dir, cache_dir, scripts_dir):
-@@ -196,6 +202,52 @@ if __name__ == '__main__':
-         if not options.hooks and os.path.exists(hooks_py_example) and not os.path.exists(hooks_py_fn):
-             shutil.copy(hooks_py_example, hooks_py_fn)
-         sys.exit(1)
-+    
-+    if options.xmpp:
-+        try:
-+            import xmpp
-+        except ImportError:
-+            log.error('python-xmpp not installed')
-+            print 'Error: You need python-xmpp installed to use the -x switch'
-+            sys.exit(1)
-+        
-+        if options.xmpp_file:
-+            if os.path.isfile(options.xmpp_file):
-+                xmpp_txt = options.xmpp_file
-+                log.info('using %s as xmpp.txt' % xmpp_txt)
-+            else:
-+                log.error('no such file: %s' % options.xmpp_file)
-+                print 'Error: There is no such file: %s' % options.xmpp_file
-+                sys.exit(1)
-+        
-+        try:
-+            xmpp_filehandle = open(xmpp_txt, 'r')            
-+        except IOError:
-+            log.error('No xmpp.txt file')
-+            print 'Error: You need to create a xmpp.txt file first.'
-+            print ''
-+            print 'Place it in %s' % os.path.dirname(xmpp_txt)
-+            print ''
-+            print ''
-+            print 'Syntax is:'
-+            print ''
-+            print '\tsender-username@server.tld senderpassword'
-+            print '\tfirst-recipient@jabberserver1.tld'
-+            print '\tsecond-recipient@jabberserver2.tld'
-+            print '\tthird-recipient@foobarserver.tld'
-+            print '\t...'
-+            print ''
-+            sys.exit(1)
-+        
-+        xmpp_lines = xmpp_filehandle.readlines()
-+        xmpp_filehandle.close()
-+        for i in xrange(len(xmpp_lines)):
-+            xmpp_lines[i] = xmpp_lines[i].strip("\n")
-+        (xmpp_from, xmpp_pass) = xmpp_lines[0].split(' ')
-+        xmpp_to = []
-+        for i in xrange(1, len(xmpp_lines)):
-+            xmpp_to.append(xmpp_lines[i])
-+        log.info('using %s to send status messages to %s' % (xmpp_from, xmpp_to))            
- 
-     headers = {
-             'User-agent': user_agent,
-@@ -285,18 +337,36 @@ if __name__ == '__main__':
-     end = datetime.datetime.now()
- 
-     # Output everything
--    if len(summary) > 1:
-+    if len(summary) > 0:
-         log.info('printing summary with %d items' % len(summary))
-         print '-'*line_length
-         print 'summary: %d changes' % (len(summary),)
-         print ''
-+        msg = ''
-         for id, line in enumerate(summary):
-             print '%02d. %s' % (id+1, line)
-+            msg += "\n" + '%02d. %s' % (id+1, line)
-         print '-'*line_length
-         print '\n\n\n'
-+        
-+        if (options.xmpp):
-+            try:
-+                (xmpp_user, xmpp_server) = xmpp_from.split('@')
-+                client = xmpp.Client(xmpp_server)
-+                client.connect(server=(xmpp_server,5223))
-+                client.auth(xmpp_user, xmpp_pass, 'urlwatch')
-+                client.sendInitPresence()
-+                for to in xmpp_to:
-+                    message = xmpp.Message(to, msg)
-+                    message.setAttr('type', 'chat')
-+                    client.send(message)
-+            except:
-+                log.error('Could not send message to %s' % xmpp_to)
-+                print 'Error: Could not send message to %s' % xmpp_to
-+            
-     else:
-         log.info('summary is too short - not printing')
--    if len(details) > 1:
-+    if len(details) > 1 and not options.xmpp:
-         log.info('printing details with %d items' % len(details))
-         print '\n'.join(details)
-         print '-- '
--- 
-1.7.0
-
diff --git a/www-misc/urlwatch/urlwatch-1.14.ebuild b/www-misc/urlwatch/urlwatch-1.14.ebuild
deleted file mode 100644
index 5dacbd7fcbfd..000000000000
--- a/www-misc/urlwatch/urlwatch-1.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/urlwatch/urlwatch-1.14.ebuild,v 1.3 2013/09/13 21:34:32 mgorny Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.5 3:3.2"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-
-inherit distutils eutils
-
-DESCRIPTION="A tool for monitoring webpages for updates"
-HOMEPAGE="http://thp.io/2008/urlwatch/ http://pypi.python.org/pypi/urlwatch"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="xmpp"
-
-RDEPEND="xmpp? ( dev-python/xmpppy )
-	virtual/python-futures"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	use xmpp && epatch "${FILESDIR}"/${PN}-xmpp.patch
-	sed -i -e "s/^os.unlink/#\0/" setup.py || die
-
-	distutils_src_prepare
-
-	2to3_conversion() {
-		[[ "${PYTHON_ABI}" == 2.* ]] && return
-		2to3-${PYTHON_ABI} -nw --no-diffs urlwatch lib/urlwatch/*.py \
-			examples/hooks.py.example setup.py || die "2to3 failed"
-	}
-	python_execute_function -s 2to3_conversion
-}
diff --git a/www-misc/urlwatch/urlwatch-1.15.ebuild b/www-misc/urlwatch/urlwatch-1.15.ebuild
deleted file mode 100644
index cc752cc065ff..000000000000
--- a/www-misc/urlwatch/urlwatch-1.15.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/www-misc/urlwatch/urlwatch-1.15.ebuild,v 1.2 2013/09/13 21:34:32 mgorny Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.5 3:3.2"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
-
-inherit distutils eutils
-
-DESCRIPTION="A tool for monitoring webpages for updates"
-HOMEPAGE="http://thp.io/2008/urlwatch/ http://pypi.python.org/pypi/urlwatch"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="xmpp"
-
-DEPEND="virtual/python-futures"
-RDEPEND="${DEPEND}
-	xmpp? ( dev-python/xmpppy )
-	|| ( www-client/lynx app-text/html2text )"
-
-src_prepare() {
-	use xmpp && epatch "${FILESDIR}"/${PN}-xmpp.patch
-	sed -i "s/^os.unlink/#\0/" setup.py || die
-
-	distutils_src_prepare
-
-	2to3_conversion() {
-		[[ "${PYTHON_ABI}" == 2.* ]] && return
-		2to3-${PYTHON_ABI} -nw --no-diffs urlwatch lib/urlwatch/*.py \
-			examples/hooks.py.example setup.py || die "2to3 failed"
-	}
-	python_execute_function -s 2to3_conversion
-}