[gentoo-commits] dev/mschiff:master commit in: net-mail/automx/, net-mail/automx/files/

[Marc Schiffbauer]

commit:     9bcb979d5a0246557b918720ae96df733cbed5ad
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 30 15:04:46 2014 +0000
Commit:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
CommitDate: Tue Dec 30 15:04:46 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/mschiff.git;a=commit;h=9bcb979d

removed automx (is in tree)

---
 net-mail/automx/ChangeLog                          | 51 ----------------
 net-mail/automx/Manifest                           |  6 --
 net-mail/automx/automx-0.10.1_pre2.ebuild          | 69 ----------------------
 .../automx-add-missing-memcache-exception.patch    | 14 -----
 .../automx/files/automx-memcache-optional.patch    | 45 --------------
 net-mail/automx/metadata.xml                       | 13 ----
 6 files changed, 198 deletions(-)

diff --git a/net-mail/automx/ChangeLog b/net-mail/automx/ChangeLog
deleted file mode 100644
index 807c916..0000000
--- a/net-mail/automx/ChangeLog
+++ /dev/null
@@ -1,51 +0,0 @@
-# ChangeLog for net-mail/automx
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/automx/ChangeLog,v 1.9 2013/12/28 11:21:49 mschiff Exp $
-
-*automx-0.10.0 (28 Dec 2013)
-
-  28 Dec 2013; Marc Schiffbauer <mschiff@g.o> +automx-0.10.0.ebuild:
-  Bump version. Closes #494652. Thanks to Andreis Vinogradovs.
-
-*automx-0.9.2 (30 Mar 2013)
-
-  30 Mar 2013; Marc Schiffbauer <mschiff@g.o> +automx-0.9.2.ebuild,
-  metadata.xml:
-  Version bump.
-
-  24 Mar 2013; Vicente Olivert Riera <vincent@g.o> automx-0.8-r1.ebuild:
-  amd64 and x86 stable wrt bug #462812
-
-*automx-0.8-r1 (02 Jan 2013)
-
-  02 Jan 2013; Marc Schiffbauer <mschiff@g.o> -automx-0.8.ebuild,
-  +automx-0.8-r1.ebuild:
-  Fix bug #449702 - thanks to Marcin Mirosław. Bump revision. Remove old
-  ebuild.
-
-*automx-0.8 (28 Mar 2012)
-
-  28 Mar 2012; Marc Schiffbauer <mschiff@g.o> -automx-0.8_rc2.ebuild,
-  +automx-0.8.ebuild:
-  Bump version. Remove old version.
-
-*automx-0.8_rc2 (23 Mar 2012)
-
-  23 Mar 2012; Marc Schiffbauer <mschiff@g.o> -automx-0.8_rc1.ebuild,
-  +automx-0.8_rc2.ebuild:
-  Bump version. Remove old version. Added sql USE flag.
-
-*automx-0.8_rc1 (15 Mar 2012)
-
-  15 Mar 2012; Marc Schiffbauer <mschiff@g.o> -automx-0.8_beta1.ebuild,
-  +automx-0.8_rc1.ebuild:
-  Version bump. Drop old version.
-
-  28 Feb 2012; Marc Schiffbauer <mschiff@g.o> automx-0.8_beta1.ebuild:
-  Always install INSTALL file.
-
-*automx-0.8_beta1 (28 Feb 2012)
-
-  28 Feb 2012; Marc Schiffbauer <mschiff@g.o> +automx-0.8_beta1.ebuild,
-  +metadata.xml:
-  New ebuild for automx.

diff --git a/net-mail/automx/Manifest b/net-mail/automx/Manifest
deleted file mode 100644
index ac85cee..0000000
--- a/net-mail/automx/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX automx-add-missing-memcache-exception.patch 497 SHA256 9b0b20be8486ee01263db8f1c1ab00434d08834bbc6d930e4691ad853e64f38f SHA512 efe3cd3c0d6e944a12cfcb1db372a2ba4164cc4c13bbf1e13a4c9c2123c9f6ecefcc555808f9d807e896302625fa66ce7dd0529e1177dce434277badcc013c17 WHIRLPOOL d099e9c582ddf2f3db314e6701ccb430095adbd3ebea45d785a9e9a0c5d65ea8a4235fbc1dc5cdc5be5310722e3680a94810a9fd8125ed85a049a930654bf0df
-AUX automx-memcache-optional.patch 1290 SHA256 baef74496e5760a0d27f64f4d632b3ea31fb6ec091ec49ac14915abd1aa85ca6 SHA512 d1e09fd54a28165eef7e65e73264e07ffe21988e47a07588946fa358abb3aace6b328c2f872d027c2533c770272a4be68c5766392deb693c01c2988a2866d1d0 WHIRLPOOL 7285d3a80410c7da9ad4d9c73d17d94a3f6404b4d4b8794f10ba6ac5b45c9adcab0b1c6c53d4dd58826aed3784c1df750e1b72cab5245dbd94912219bacabc8f
-DIST automx-0.10.0.tgz 410218 SHA256 4a367dc1d96ddc3dd01765854bbd76ac5cd4463e0abadb442d8c6c8155f325d7 SHA512 187540b4a2379968dcb5f2ef3d0f632add36f113a5ed04f6ff0d3785fec98f42af141875d45164b4a017637b2e4b1480fe2c602db2947fcb12aa85cc5787c990 WHIRLPOOL d005da5eb382bba5bece03f21d951b9025cf4015eb0a0f4920d1566ec266fd26a3cbd34aadf2c2761ce199e42afb84bb8c41690cd5c944643ee59de53b6591e8
-EBUILD automx-0.10.1_pre2.ebuild 1612 SHA256 b6f93d62c15acf0bf20d246e04c62f1cad608a69e4b5da50db921e396543b36a SHA512 8e205d04b578338b1609804c382b111aba830059e3c253a509993037d26c880a78e19c1d0696a10c82e85f03e691195aa3252be718e144c6377532761e16d105 WHIRLPOOL cd6d29a2667d541fe259e35d8bcd7991ccd39f0cd989cc2263040aa6d68f03a4547f651014f0524e0e09b65880200dabe042cf89a870bd62225e41419acbcc65
-MISC ChangeLog 1633 SHA256 cb990b2400cf1bd0870a8c3d2d077711f0d65b50fbea099fbe2cff5394a3150d SHA512 b4c0f99a99decb90dd8a988d672c7991ba10bba9aecd96d7796f80a133407c905fbfc55d585cb94949c38d1feba3c1345c7b32188c437a27944cccf6f119371d WHIRLPOOL b21c0174d29a54c5c9da3048350d2e5c237602da781f5624e428a7725f08e4f6504886a2508096f9f8de1f816045787b93b358e8c4ed19d771702482dfc6ce7a
-MISC metadata.xml 430 SHA256 c4230b47da093af67c2a2b2b32d9bd62abcaab5bbf37605e4f50ffa675a9c802 SHA512 f285e73eb372cb504e57d648d506db0254cbfdca1ad0488e94defaff489ffdf9fa5618b2dd856944d2928d993870a6c0c8eb622185897fd2bd4592d53cf2d111 WHIRLPOOL efe246064245388ab1e81b7954631e771adaa30866ec98d997c5e8daacdf59111667578c8744eca727aaf4092c478bef8143ea3ddf160cda954eb91cbdd453c0

diff --git a/net-mail/automx/automx-0.10.1_pre2.ebuild b/net-mail/automx/automx-0.10.1_pre2.ebuild
deleted file mode 100644
index c3b1184..0000000
--- a/net-mail/automx/automx-0.10.1_pre2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/automx/automx-0.10.0.ebuild,v 1.1 2013/12/28 11:21:49 mschiff Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils distutils-r1
-
-DESCRIPTION="A mail user agent auto configuration service"
-HOMEPAGE="http://www.automx.org"
-SRC_URI="https://github.com/sys4/${PN}/archive/v0.10.0.tar.gz -> automx-0.10.0.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap memcached sql +tools"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="
-	${DEPEND}
-	dev-python/ipaddr[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	|| ( www-apache/mod_wsgi www-servers/uwsgi )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}]  )
-	memcached? ( dev-python/python-memcached )
-	sql? ( dev-python/sqlalchemy[${PYTHON_USEDEP}] )
-	tools? ( net-dns/bind-tools net-misc/wget )
-	"
-
-PATCHES=(
-	"$FILESDIR/${PN}-memcache-optional.patch"
-	"$FILESDIR/${PN}-add-missing-memcache-exception.patch"
-	)
-S="${WORKDIR}/${PN}-0.10.0"
-
-#src_prepare() {
-#	epatch
-#	sed -i '/py_modules=/d' setup.py
-#}
-
-src_install() {
-	distutils-r1_src_install
-
-	dodoc INSTALL CREDITS CHANGES BASIC_CONFIGURATION_README
-	dohtml -r doc/html/*
-
-	docinto examples
-	dodoc src/conf/*example*
-
-	doman doc/man/man5/*
-
-	if use tools; then
-		exeinto /usr/bin
-		doexe src/automx-test
-		doman doc/man/man1/automx-test.1
-	fi
-
-	exeinto /usr/lib/${PN}
-	doexe src/automx_wsgi.py
-}
-
-pkg_postinst() {
-	einfo
-	einfo "See /usr/share/doc/${PF}/INSTALL.bz2 for setup instructions"
-	einfo
-}

diff --git a/net-mail/automx/files/automx-add-missing-memcache-exception.patch b/net-mail/automx/files/automx-add-missing-memcache-exception.patch
deleted file mode 100644
index bd6f704..0000000
--- a/net-mail/automx/files/automx-add-missing-memcache-exception.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/automx/config.py b/src/automx/config.py
-index 4839b17..0d77595 100644
---- a/src/automx/config.py
-+++ b/src/automx/config.py
-@@ -849,6 +849,9 @@ class Memcache(object):
-         except ValueError, e:
-             logging.warning("Memcache misconfigured: ", e)
-             self.__has_memcache = False
-+        except NoOptionError:
-+            logging.warning("Not using Memcache")
-+            self.__has_memcache = False
- 
-     def counter(self):
-         return self.__current

diff --git a/net-mail/automx/files/automx-memcache-optional.patch b/net-mail/automx/files/automx-memcache-optional.patch
deleted file mode 100644
index a290030..0000000
--- a/net-mail/automx/files/automx-memcache-optional.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/src/automx/config.py b/src/automx/config.py
-index 48a8e16..a79fb34 100644
---- a/src/automx/config.py
-+++ b/src/automx/config.py
-@@ -27,9 +27,14 @@ import subprocess
- import shlex
- import StringIO
- import re
--import memcache
- import logging
- 
-+try:
-+    import memcache
-+    use_memcache = True
-+except ImportError:
-+    use_memcache = False
-+
- from ConfigParser import NoOptionError, NoSectionError
- from ipaddr import IPAddress, IPNetwork
- from dateutil import parser
-@@ -849,7 +854,7 @@ class Memcache(object):
-         return self.__current
- 
-     def set_client(self):
--        if not self.__has_memcache:
-+        if not self.__has_memcache or use_memcache is False:
-             return
- 
-         if self.__is_trusted_network():
-@@ -870,7 +875,7 @@ class Memcache(object):
-         self.__mc.set(self.__client, self.__current, time=ttl)
-                                                             
-     def allow_client(self):
--        if not self.__has_memcache:
-+        if not self.__has_memcache or use_memcache is False:
-             return True
- 
-         self.__client = self.__environ["REMOTE_ADDR"]
-@@ -914,4 +919,4 @@ class Memcache(object):
-         
-         return False
- 
--# vim: expandtab ts=4 sw=4
-\ No newline at end of file
-+# vim: expandtab ts=4 sw=4

diff --git a/net-mail/automx/metadata.xml b/net-mail/automx/metadata.xml
deleted file mode 100644
index 6b795b8..0000000
--- a/net-mail/automx/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>mschiff@g.o</email>
-		<name>Marc Schiffbauer</name>
-	</maintainer>
-	<use>
-		<flag name="memcached">Enable memcached support</flag>
-		<flag name="sql">Enable support for SQL backends</flag>
-		<flag name="tools">Install additional automx-test tool</flag>
-	</use>
-</pkgmetadata>