Remove old, unused patches.

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

4 files changed, 7 insertions, 94 deletions

diff --git a/net-irc/atheme-services/ChangeLog b/net-irc/atheme-services/ChangeLog
index d4c93d9dfc5f..488a93b79876 100644
--- a/net-irc/atheme-services/ChangeLog
+++ b/net-irc/atheme-services/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/atheme-services
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.44 2012/05/15 08:31:15 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.45 2012/05/15 09:01:52 jdhore Exp $
+
+  15 May 2012; Jeff Horelick <jdhore@gentoo.org>
+  -files/atheme-services-6.0.9-cracklib-automagic.patch,
+  -files/atheme-services-7.0.0-perl-build-fix.patch:
+  Remove old, unused patches.
 
 *atheme-services-6.0.11 (15 May 2012)
 *atheme-services-7.0.2 (15 May 2012)
diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest
index 72d58306c9fd..200186bc36e4 100644
--- a/net-irc/atheme-services/Manifest
+++ b/net-irc/atheme-services/Manifest
@@ -1,6 +1,4 @@
 AUX atheme-services-6.0.8-configure-disable.patch 4067 RMD160 83b845addd7af78d10a4b8447e9ec3c88f7efa17 SHA1 a893c2fab189495b31525332a8c4c9ffdcbd3aaf SHA256 861b9b458e6e2122aca923425dec407a5d2a13fecde613544c5aafb2cb161595
-AUX atheme-services-6.0.9-cracklib-automagic.patch 2806 RMD160 e2915f4fab7aea2d4a512ce462e8bf7fda08cb80 SHA1 8c1f28b6446e66355171c0e9badcc6424144d42a SHA256 810509891a461b2d6701c8f48519d70436cba698bf0ab098ab02cef13f0a2619
-AUX atheme-services-7.0.0-perl-build-fix.patch 576 RMD160 be33ab1e8703c9e9a068e4bb03d5f5477a875d89 SHA1 e3eae034478efe4a8294af2d23a78c188d74b066 SHA256 c1bf9de2808769d42b2dccf8ed46bb135edf2cf98994ad81aa9555e8eef05bd1
 AUX atheme-services.initd 975 RMD160 83486b35d148bab6f4b611d62fb18da63846a966 SHA1 bedd35acca25fad59ecd067709cfe85c0ba9798d SHA256 0cdcfb95d2399e132364127429618b44ce1830a61af0a5dc5bce1179b3810f75
 DIST atheme-services-6.0.10.tar.bz2 897748 RMD160 e7e1e606cb29c426568d462f6afab4709a1c2124 SHA1 7b38b5f99cf0f2dab6c19557514cc5a6a8ca0d35 SHA256 9a2b3954316d29ae0cd546edc9c2b6169bae448f982dbd76ca3efd84c271d0c8
 DIST atheme-services-6.0.11.tar.bz2 859123 RMD160 c01d835e6401e97f67d7647959b59b38297e9b1f SHA1 e6cb8156583c9daa4619cfee5e5e1cd8a38b7b2d SHA256 762bc717d4710d135f8654025c34c4fc431a6a8cf7345e994fbe800fa78a9f74
@@ -11,5 +9,5 @@ EBUILD atheme-services-6.0.11.ebuild 2791 RMD160 d50a64b500d2fa6a0bad6825963629f
 EBUILD atheme-services-7.0.1.ebuild 2905 RMD160 8c5a2cde985ed2eb42dc907d2ad3522458433ded SHA1 ec45334e2d67ee0a9e6731a62215788dcabab02c SHA256 efd536afed578df4382d804f21338b907485804620bfccbea9504a30d0fc72ce
 EBUILD atheme-services-7.0.2.ebuild 2905 RMD160 8b6b5546ec90d6f53b31003487bd870ec581a45c SHA1 1b89231cd00d3d79e4ac5ca24049f46f05530ff2 SHA256 8823d421126a1266c4a044769f677674e3a05c3362fbdd93651d4247317c0ce2
 EBUILD atheme-services-9999.ebuild 3052 RMD160 e97c9a43e84bfc7dc2ce691afd099d583ddc8016 SHA1 c3f2ba7a732a21b7c98964e22112e39f28809256 SHA256 faf46a0b9b1cd2145274365c90b25a4a0fe68e76ab93c687940befb5f22b8c0d
-MISC ChangeLog 9267 RMD160 1dad97478f9624040d819536ebff4921415c974c SHA1 3414ca1eefc8cdd88f97b94608c37234e2572a71 SHA256 3b92b86f03ee8a19ce64fb61efb8de8ecd13875c768770eed8d365ec86221e89
+MISC ChangeLog 9457 RMD160 17381b6f0980fa2a6575224d5eade17e95521d4c SHA1 a23e3895ef0100af7240f1ca2b9bac2d135c5fab SHA256 6c0469a0d561e9540c324a10172a5799fff9aa8571d8cd3c44de1284fabd463c
 MISC metadata.xml 771 RMD160 6681a3e8f489ae5a5b0ae882a11d423b932f0081 SHA1 07abec75deb6154fc71a3ff5cf9057d3ce713adb SHA256 a837c036193dc300db84f5539f463723abaa14e1fb15ca6314b7e850fdfac460
diff --git a/net-irc/atheme-services/files/atheme-services-6.0.9-cracklib-automagic.patch b/net-irc/atheme-services/files/atheme-services-6.0.9-cracklib-automagic.patch
deleted file mode 100644
index 07b523e07cb8..000000000000
--- a/net-irc/atheme-services/files/atheme-services-6.0.9-cracklib-automagic.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 79f41f4e7647335beca977d852c6c83abebcc2bd Mon Sep 17 00:00:00 2001
-From: Nathan Phillip Brink <binki@gentoo.org>
-Date: Tue, 3 Jan 2012 01:47:31 +0000
-Subject: [PATCH] Add --with-cracklib/--without-cracklib ./configure options and only pass -lcrack when compiling nickserv/cracklib module.
-
-Being able to disable cracklib at ./configure time fixes an automagic
-dependency (https://bugs.gentoo.org/397401 with original patch from
-kensington). Only linking against cracklib when necessary hopefully
-makes compilation and loading of modules slightly more efficient.
----
- configure                 |   27 ++++++++++++++++++++++++++-
- configure.ac              |   16 +++++++++++++++-
- extra.mk.in               |    1 +
- modules/nickserv/Makefile |   10 ++++++++++
- 4 files changed, 52 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 63540aa..ee8d554 100755
-diff --git a/configure.ac b/configure.ac
-index 83c4aeb..a6d8b6e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -95,8 +95,22 @@ AC_SEARCH_LIBS(crypt, crypt, [POSIX_CRYPTC="posix.c"])
- AC_SUBST(POSIX_CRYPTC)
- 
- CRACKLIB_C=""
--AC_SEARCH_LIBS(FascistCheck, crack, [CRACKLIB_C="cracklib.c"])
-+CRACKLIB_LIBS=""
-+AC_ARG_WITH([cracklib],
-+	[AS_HELP_STRING([--with-cracklib], [Compile cracklib nickserv submodule for checking password strength.])],
-+	[],
-+	[with_cracklib="auto"])
-+AS_IF([test "x$with_cracklib" != "xno"],
-+	[LIBS_save="$LIBS"
-+	AC_SEARCH_LIBS([FascistCheck], [crack],
-+		[CRACKLIB_C="cracklib.c"
-+		AS_IF([test "x$ac_cv_search_FascistCheck" != "xnone required"],
-+			[CRACKLIB_LIBS="$ac_cv_search_FascistCheck"])],
-+		[AS_IF([test "x$with_cracklib" != "xauto"],
-+			[AC_MSG_ERROR([--with-cracklib was specified but cracklib could not be found.])])])
-+	LIBS="$LIBS_save"])
- AC_SUBST(CRACKLIB_C)
-+AC_SUBST([CRACKLIB_LIBS])
- 
- AC_ARG_WITH([ldap],
- 	[AS_HELP_STRING([--without-ldap],[Disable building ldap auth module.])],
-diff --git a/extra.mk.in b/extra.mk.in
-index cc6af70..2d01345 100644
---- a/extra.mk.in
-+++ b/extra.mk.in
-@@ -123,4 +123,5 @@ EGREP ?= @EGREP@
- VERSION ?= @VERSION@
- prefix ?= @prefix@
- CRACKLIB_C ?= @CRACKLIB_C@
-+CRACKLIB_LIBS ?= @CRACKLIB_LIBS@
- CONTRIB_ENABLE ?= @CONTRIB_ENABLE@
-diff --git a/modules/nickserv/Makefile b/modules/nickserv/Makefile
-index 060f708..d2f7c4e 100644
---- a/modules/nickserv/Makefile
-+++ b/modules/nickserv/Makefile
-@@ -68,3 +68,13 @@ BASE_SRCS =			\
- SRCS = ${BASE_SRCS} ${EXTRA_SRCS}
- 
- CPPFLAGS	+= -I../../include
-+
-+# Custom rule for cracklib.c which is the only module to ever need
-+# -lcrack.
-+cracklib$(PLUGIN_SUFFIX): cracklib.c
-+	${COMPILE_STATUS}
-+	if ${CC} -MMD -MP ${CFLAGS} ${PLUGIN_CFLAGS} ${CPPFLAGS} ${PLUGIN_LDFLAGS} ${LDFLAGS} -o $@ ${CRACKLIB_C} ${LIBS} ${CRACKLIB_LIBS}; then \
-+		${COMPILE_OK}; \
-+	else \
-+		${COMPILE_FAILED}; \
-+	fi
--- 
-1.7.3.4
-
diff --git a/net-irc/atheme-services/files/atheme-services-7.0.0-perl-build-fix.patch b/net-irc/atheme-services/files/atheme-services-7.0.0-perl-build-fix.patch
deleted file mode 100644
index 196034e4ef0d..000000000000
--- a/net-irc/atheme-services/files/atheme-services-7.0.0-perl-build-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/modules/scripting/perl/Makefile b/modules/scripting/perl/Makefile
-index b7e4dbd..bce7584 100644
---- a/modules/scripting/perl/Makefile
-+++ b/modules/scripting/perl/Makefile
-@@ -12,7 +12,7 @@ include ../../../buildsys.mk
- 
- plugindir = $(MODDIR)/modules/scripting
- 
--CPPFLAGS += -I../../../include -I. $(PERL_CFLAGS) -DPERL_MODDIR='"$(plugindir)"'
-+CPPFLAGS += -I../../../include -I. $(PERL_CFLAGS) -DPERL_MODDIR=\"$(plugindir)\"
- CFLAGS += $(PLUGIN_CFLAGS)
- LDFLAGS += $(PLUGIN_LDFLAGS) $(PERL_LIBS)
- LIBS +=	-L../../../libathemecore -lathemecore ${LDFLAGS_RPATH}