Remove old, unused patches.

(Portage version: 2.2.0_alpha105/cvs/Linux i686)

3 files changed, 6 insertions, 91 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/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}