Remove obsolete versions and obsolete patches.

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

7 files changed, 9 insertions, 444 deletions

diff --git a/net-irc/atheme-services/ChangeLog b/net-irc/atheme-services/ChangeLog
index e69d58002e23..ed869a53bf82 100644
--- a/net-irc/atheme-services/ChangeLog
+++ b/net-irc/atheme-services/ChangeLog
@@ -1,6 +1,13 @@
 # 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.38 2012/03/21 09:24:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.39 2012/04/20 02:36:07 jdhore Exp $
+
+  20 Apr 2012; Jeff Horelick <jdhore@gentoo.org>
+  -atheme-services-7.0.0_alpha11.ebuild, -atheme-services-7.0.0_alpha9.ebuild,
+  -files/atheme-services-7.0.0_alpha11-cracklib-automagic.patch,
+  -files/atheme-services-7.0.0_alpha11-unrealircd.patch,
+  -files/atheme-services-7.0.0_alpha9-pkg-config.patch:
+  Remove obsolete versions and obsolete patches.
 
   21 Mar 2012; Jeff Horelick <jdhore@gentoo.org>
   -atheme-services-6.0.9-r1.ebuild:
diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest
index 12622ed66a13..a15b602bbe4e 100644
--- a/net-irc/atheme-services/Manifest
+++ b/net-irc/atheme-services/Manifest
@@ -1,15 +1,8 @@
 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_alpha11-cracklib-automagic.patch 2906 RMD160 eed1183188ddc3f94c9606e131bbd14d7f17b971 SHA1 fc65b6b2b699bdf644e900b1fe700186b796597d SHA256 b053939d5c813e790eb2d8ffb7a95430d3a38b0c09c9a6c7776b50e4215c9763
-AUX atheme-services-7.0.0_alpha11-unrealircd.patch 3953 RMD160 8802ea74b02214a0bcbfa5be5790e496aa11b7a7 SHA1 aeda7b917d505e81cd1d326f6a52fd516976202d SHA256 99762e6d01ec2ad7c147b51efaab9a3e1204dca274f5953580eb930c2038e437
-AUX atheme-services-7.0.0_alpha9-pkg-config.patch 515 RMD160 aeed772eb3f741f14b405aff145235b8ab186978 SHA1 38abf5c9ac33f5a2e25d96f191f9c2bbcbe91767 SHA256 6f43dceda07461600962e11b69d0e62e01d878f93126d98b09bfd48d2c790c7e
 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-7.0.0-alpha11.tar.bz2 989641 RMD160 c0520292ce294f0cd0682ed39e699d03a747d0c6 SHA1 160c37a93fa19d2dae0c2daaffd07061567c633b SHA256 0b97edc89bc503c61e9aa6183be985564ee39f038c3d0565da8a92c12a3b12eb
-DIST atheme-services-7.0.0-alpha9.tar.bz2 1055265 RMD160 d86413c63c79579247904965fffa7c2b1e76d688 SHA1 28168d0b4ab36840dd3522283dca2aebbb9a56d3 SHA256 564add960be744d637573d69ee12351555696048e69505af596d767f55b0b3b6
 EBUILD atheme-services-6.0.10.ebuild 2790 RMD160 2a330313232182bafda51c6d0e0578ba9f363b09 SHA1 abcf4344bd09d9d10c1215e0c688692fa27cdc38 SHA256 a098ad6ac52ee1b6f255ad01a4815d9b7302d312a88d0d7204b5e5b33d68120b
-EBUILD atheme-services-7.0.0_alpha11.ebuild 3003 RMD160 b1e3be8ac34b12eb83f1768baa585c7e4ba2e597 SHA1 93e9a179f4d4e1f34e2e6d40ab31e4ff46cc8c74 SHA256 a467d641318faa562ec8571562fceb6918734327530dd57bd2c4bcb4486bd4f7
-EBUILD atheme-services-7.0.0_alpha9.ebuild 3138 RMD160 03aef4d4dac4fccb295e9e913b653811b6b903b4 SHA1 a27a394207a6b947752a743736c3c2e5d8f73140 SHA256 41811f5917ce727cf6a3e45d2f9842567cf15fe1db09a309cdfd4cd4be637094
 EBUILD atheme-services-9999.ebuild 3034 RMD160 d03cd2e7c63d0a87af9866542de20c4d08eaf469 SHA1 1e3caa9b0a6a900abd4bb80f85fb38966a854a82 SHA256 08d88d137d85ee7c01814bbf638894705908fb4a69a13e68c25e158a0edbb203
-MISC ChangeLog 7817 RMD160 21d6d88f89a5a8e630f6573966b5e280cffe9579 SHA1 259119f04b912a24e7777b2b5e232b7f7b4bb686 SHA256 1749d21b408ebfd96c1099bd672183b9dddb770c24e51f446d27de962a887068
+MISC ChangeLog 8173 RMD160 88adda7a83246a1ce25844d2373a866084fabbd6 SHA1 4d19b433148d2a0c98a832136b045a18e68440d2 SHA256 0b807a88558f9497a0e94f3774dfcd4301a4e094cd28e6d7d1df5ddfb7f35486
 MISC metadata.xml 771 RMD160 6681a3e8f489ae5a5b0ae882a11d423b932f0081 SHA1 07abec75deb6154fc71a3ff5cf9057d3ce713adb SHA256 a837c036193dc300db84f5539f463723abaa14e1fb15ca6314b7e850fdfac460
diff --git a/net-irc/atheme-services/atheme-services-7.0.0_alpha11.ebuild b/net-irc/atheme-services/atheme-services-7.0.0_alpha11.ebuild
deleted file mode 100644
index 6c22746704ca..000000000000
--- a/net-irc/atheme-services/atheme-services-7.0.0_alpha11.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-7.0.0_alpha11.ebuild,v 1.2 2012/03/18 15:22:19 armin76 Exp $
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic perl-module
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A portable and secure set of open-source and modular IRC services"
-HOMEPAGE="http://atheme.net/"
-SRC_URI="http://atheme.net/downloads/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux"
-IUSE="cracklib largenet ldap nls +pcre perl profile ssl"
-
-RDEPEND="dev-libs/libmowgli:2
-	cracklib? ( sys-libs/cracklib )
-	ldap? ( net-nds/openldap )
-	nls? ( sys-devel/gettext )
-	perl? ( dev-lang/perl )
-	pcre? ( dev-libs/libpcre )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	# the dependency calculation puts all of the .c files together and
-	# overwhelms cc1 with this flag :-(
-	filter-flags -combine
-
-	if use profile; then
-		# bug #371119
-		ewarn "USE=\"profile\" is incompatible with the hardened profile's -pie flag."
-		ewarn "Disabling PIE. Please ignore any warning messages about -nopie being invalid."
-		append-flags -nopie
-	fi
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/atheme ${PN}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cracklib-automagic.patch
-	epatch "${FILESDIR}"/${P}-unrealircd.patch
-	eautoconf
-
-	# fix docdir
-	sed -i -e 's/\(^DOCDIR.*=.\)@DOCDIR@/\1@docdir@/' extra.mk.in || die
-
-	# basic logging config directive fix
-	sed -i -e '/^logfile/s;var/\(.*\.log\);'"${EPREFIX}"'/var/log/atheme/\1;g' dist/* || die
-
-	# QA against bundled libs
-	rm -rf libmowgli-2 || die
-
-	# Get useful information into build.log
-	sed -i -e '/^\.SILENT:$/d' buildsys.mk.in || die
-}
-
-src_configure() {
-	econf \
-		atheme_cv_c_gcc_w_error_implicit_function_declaration=no \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-fhs-paths \
-		--disable-warnings \
-		--enable-contrib \
-		$(use_enable largenet large-net) \
-		$(use_with cracklib) \
-		$(use_with ldap) \
-		$(use_with nls) \
-		$(use_enable profile) \
-		$(use_with perl) \
-		$(use_with pcre) \
-		$(use_enable ssl)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc/${PN}
-	for conf in dist/*.example; do
-		# The .cron file isn't meant to live in /etc/${PN}, so only
-		# install a .example version.
-		[[ ${conf} == *cron* ]] && continue
-
-		newins ${conf} $(basename ${conf} .example)
-	done
-
-	fowners -R 0:${PN} /etc/${PN}
-	keepdir /var/{lib,log}/atheme
-	fowners ${PN}:${PN} /var/{lib,log,run}/atheme
-	fperms -R go-w,o-rx /etc/${PN}
-	fperms 750 /etc/${PN} /var/{lib,log,run}/atheme
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-	# contributed scripts and such:
-	insinto /usr/share/doc/${PF}/contrib
-	doins contrib/*.{c,pl,php,py,rb}
-
-	if use perl; then
-		perlinfo
-		insinto "${VENDOR_LIB#${EPREFIX}}"
-		doins -r contrib/Atheme{,.pm}
-	fi
-}
diff --git a/net-irc/atheme-services/atheme-services-7.0.0_alpha9.ebuild b/net-irc/atheme-services/atheme-services-7.0.0_alpha9.ebuild
deleted file mode 100644
index a42dce142ac7..000000000000
--- a/net-irc/atheme-services/atheme-services-7.0.0_alpha9.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-7.0.0_alpha9.ebuild,v 1.5 2012/03/18 15:22:19 armin76 Exp $
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic perl-module
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A portable and secure set of open-source and modular IRC services"
-HOMEPAGE="http://atheme.net/"
-SRC_URI="http://atheme.net/downloads/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux"
-IUSE="cracklib largenet ldap nls +pcre perl profile ssl"
-
-RDEPEND=">=dev-libs/libmowgli-0.9.95:0
-	cracklib? ( sys-libs/cracklib )
-	ldap? ( net-nds/openldap )
-	nls? ( sys-devel/gettext )
-	perl? ( dev-lang/perl )
-	pcre? ( dev-libs/libpcre )
-	ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	# the dependency calculation puts all of the .c files together and
-	# overwhelms cc1 with this flag :-(
-	filter-flags -combine
-
-	if use profile; then
-		# bug #371119
-		ewarn "USE=\"profile\" is incompatible with the hardened profile's -pie flag."
-		ewarn "Disabling PIE. Please ignore any warning messages about -nopie being invalid."
-		append-flags -nopie
-	fi
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/atheme ${PN}
-}
-
-src_prepare() {
-	# The first PKG_CHECK_MODULES call is conditional, causing
-	# PKG_PROG_PKG_CONFIG expansion to fail.
-	epatch "${FILESDIR}"/${P}-pkg-config.patch
-	epatch "${FILESDIR}"/${PN}-7.0.0_alpha11-cracklib-automagic.patch
-	eautoconf
-
-	# fix docdir
-	sed -i -e 's/\(^DOCDIR.*=.\)@DOCDIR@/\1@docdir@/' extra.mk.in || die
-
-	# basic logging config directive fix
-	sed -i -e '/^logfile/s;var/\(.*\.log\);'"${EPREFIX}"'/var/log/atheme/\1;g' dist/* || die
-
-	# QA against bundled libs
-	rm -rf libmowgli libmowgli-2 || die
-
-	# Get useful information into build.log
-	sed -i -e '/^\.SILENT:$/d' buildsys.mk.in || die
-}
-
-src_configure() {
-	econf \
-		atheme_cv_c_gcc_w_error_implicit_function_declaration=no \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--localstatedir="${EPREFIX}"/var \
-		--enable-fhs-paths \
-		--disable-warnings \
-		--enable-contrib \
-		$(use_enable largenet large-net) \
-		$(use_with cracklib) \
-		$(use_with ldap) \
-		$(use_with nls) \
-		$(use_enable profile) \
-		$(use_with perl) \
-		$(use_with pcre) \
-		$(use_enable ssl)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc/${PN}
-	for conf in dist/*.example; do
-		# The .cron file isn't meant to live in /etc/${PN}, so only
-		# install a .example version.
-		[[ ${conf} == *cron* ]] && continue
-
-		newins ${conf} $(basename ${conf} .example)
-	done
-
-	fowners -R 0:${PN} /etc/${PN}
-	keepdir /var/{lib,log}/atheme
-	fowners ${PN}:${PN} /var/{lib,log,run}/atheme
-	fperms -R go-w,o-rx /etc/${PN}
-	fperms 750 /etc/${PN} /var/{lib,log,run}/atheme
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-	# contributed scripts and such:
-	insinto /usr/share/doc/${PF}/contrib
-	doins contrib/*.{c,pl,php,py,rb}
-
-	if use perl; then
-		perlinfo
-		insinto "${VENDOR_LIB#${EPREFIX}}"
-		doins -r contrib/Atheme{,.pm}
-	fi
-}
diff --git a/net-irc/atheme-services/files/atheme-services-7.0.0_alpha11-cracklib-automagic.patch b/net-irc/atheme-services/files/atheme-services-7.0.0_alpha11-cracklib-automagic.patch
deleted file mode 100644
index 676acae15a47..000000000000
--- a/net-irc/atheme-services/files/atheme-services-7.0.0_alpha11-cracklib-automagic.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From ca15c587e5c102abe0bc72a3112f7c5c6c879483 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 |    9 +++++++++
- 4 files changed, 51 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 14a14da..fe8024f 100755
-diff --git a/configure.ac b/configure.ac
-index ed7d105..ab0adb5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -97,8 +97,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 a59418c..bdce891 100644
---- a/extra.mk.in
-+++ b/extra.mk.in
-@@ -123,6 +123,7 @@ EGREP ?= @EGREP@
- VERSION ?= @VERSION@
- prefix ?= @prefix@
- CRACKLIB_C ?= @CRACKLIB_C@
-+CRACKLIB_LIBS ?= @CRACKLIB_LIBS@
- CONTRIB_ENABLE ?= @CONTRIB_ENABLE@
- PERL_ENABLE ?= @PERL_ENABLE@
- PERL_CFLAGS ?= @PERL_CFLAGS@
-diff --git a/modules/nickserv/Makefile b/modules/nickserv/Makefile
-index 3014bbb..2506be4 100644
---- a/modules/nickserv/Makefile
-+++ b/modules/nickserv/Makefile
-@@ -72,3 +72,12 @@ include ../../buildsys.module.mk
- CPPFLAGS	+= -I../../include
- LIBS +=	-L../../libathemecore -lathemecore ${LDFLAGS_RPATH}
- 
-+# 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_alpha11-unrealircd.patch b/net-irc/atheme-services/files/atheme-services-7.0.0_alpha11-unrealircd.patch
deleted file mode 100644
index 7b5d69ed6121..000000000000
--- a/net-irc/atheme-services/files/atheme-services-7.0.0_alpha11-unrealircd.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 5f64c859cba285f4207a08cc4f02dc450a5b600d Mon Sep 17 00:00:00 2001
-From: Nathan Phillip Brink <binki@gentoo.org>
-Date: Mon, 28 Nov 2011 05:28:11 +0000
-Subject: [PATCH] libathemecore: Fix NULL dereference when talking to IRCds without UID support.
-
-Fixes regression caused by c14ab567552c0053cb4c5d184956d0a1a7a5d19f.
----
- include/users.h          |    2 +-
- libathemecore/services.c |    6 +++---
- libathemecore/users.c    |   12 ++++++------
- 3 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/include/users.h b/include/users.h
-index 16deee9..643a23a 100644
---- a/include/users.h
-+++ b/include/users.h
-@@ -55,7 +55,7 @@ struct user_
- #define UF_WASENFORCED 0x00002000 /* this user was FNCed once already */
- #define UF_DEAF        0x00004000 /* user does not receive channel msgs */
- 
--#define CLIENT_NAME(user)	((user)->uid[0] ? (user)->uid : (user)->nick)
-+#define CLIENT_NAME(user)	((user)->uid != NULL ? (user)->uid : (user)->nick)
- 
- typedef struct {
- 	user_t *u;		/* User in question. Write NULL here if you delete the user. */
-diff --git a/libathemecore/services.c b/libathemecore/services.c
-index abcd7fc..3725234 100644
---- a/libathemecore/services.c
-+++ b/libathemecore/services.c
-@@ -245,9 +245,9 @@ void services_init(void)
- 
- 	MOWGLI_PATRICIA_FOREACH(svs, &state, services_name)
- 	{
--		if (ircd->uses_uid && svs->me->uid[0] == '\0')
-+		if (ircd->uses_uid && svs->me->uid == NULL)
- 			user_changeuid(svs->me, uid_get());
--		else if (!ircd->uses_uid && svs->me->uid[0] != '\0')
-+		else if (!ircd->uses_uid && svs->me->uid != NULL)
- 			user_changeuid(svs->me, NULL);
- 		if (!ircd->uses_uid)
- 			kill_id_sts(NULL, svs->nick, "Attempt to use service nick");
-@@ -311,7 +311,7 @@ void reintroduce_user(user_t *u)
- 	/* Reintroduce with a new UID.  This avoids problems distinguishing
- 	 * commands targeted at the old and new user.
- 	 */
--	if (*u->uid)
-+	if (u->uid != NULL)
- 	{
- 		user_changeuid(u, uid_get());
- 	}
-diff --git a/libathemecore/users.c b/libathemecore/users.c
-index 432b9ea..18a8855 100644
---- a/libathemecore/users.c
-+++ b/libathemecore/users.c
-@@ -134,7 +134,7 @@ user_t *user_add(const char *nick, const char *user, const char *host,
- 		{
- 			wallops("Server %s is introducing nick %s which already exists on %s",
- 					server->name, nick, u2->server->name);
--			if (uid != NULL && *u2->uid != '\0')
-+			if (uid != NULL && u2->uid != NULL)
- 			{
- 				kill_id_sts(NULL, uid, "Ghost detected via nick collision (new)");
- 				kill_id_sts(NULL, u2->uid, "Ghost detected via nick collision (old)");
-@@ -244,7 +244,7 @@ void user_delete(user_t *u, const char *comment)
- 
- 	mowgli_patricia_delete(userlist, u->nick);
- 
--	if (*u->uid)
-+	if (u->uid != NULL)
- 		mowgli_patricia_delete(uidlist, u->uid);
- 
- 	mowgli_node_delete(&u->snode, &u->server->userlist);
-@@ -364,13 +364,13 @@ void user_changeuid(user_t *u, const char *uid)
- {
- 	return_if_fail(u != NULL);
- 
--	if (*u->uid)
-+	if (u->uid != NULL)
- 		mowgli_patricia_delete(uidlist, u->uid);
- 
- 	strshare_unref(u->uid);
- 	u->uid = strshare_get(uid);
- 
--	if (*u->uid)
-+	if (u->uid != NULL)
- 		mowgli_patricia_add(uidlist, u->uid, u);
- }
- 
-@@ -420,7 +420,7 @@ bool user_changenick(user_t *u, const char *nick, time_t ts)
- 		slog(LG_INFO, "user_changenick(): nick collision on %s", nick);
- 		if (u2->server == me.me)
- 		{
--			if (*u->uid != '\0')
-+			if (u->uid != NULL)
- 			{
- 				/* If the changing client has a UID, our
- 				 * client will have a UID too and the
-@@ -466,7 +466,7 @@ bool user_changenick(user_t *u, const char *nick, time_t ts)
- 			wallops("Server %s is sending nick change from %s to %s which already exists on %s",
- 					u->server->name, u->nick, nick,
- 					u2->server->name);
--			if (*u->uid != '\0' && *u2->uid != '\0')
-+			if (u->uid != NULL && u2->uid != NULL)
- 			{
- 				kill_id_sts(NULL, u->uid, "Ghost detected via nick change collision (new)");
- 				kill_id_sts(NULL, u2->uid, "Ghost detected via nick change collision (old)");
--- 
-1.7.3.4
-
diff --git a/net-irc/atheme-services/files/atheme-services-7.0.0_alpha9-pkg-config.patch b/net-irc/atheme-services/files/atheme-services-7.0.0_alpha9-pkg-config.patch
deleted file mode 100644
index 5a81d332607e..000000000000
--- a/net-irc/atheme-services/files/atheme-services-7.0.0_alpha9-pkg-config.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Nathan Phillip Brink <binki@gentoo.org>
-Subject: Fix missing call to PKG_PROG_PKG_CONFIG caused by conditional
-	invokation of the first PKG_CHECK_MODULES call.
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -561,6 +561,10 @@
- [],
- [with_mowgli2=no])
- 
-+dnl If the first PKG_CHECK_MODULES invokation is conditional, we must
-+dnl manually invoke PKG_PROG_PKG_CONFIG:
-+PKG_PROG_PKG_CONFIG
-+
- if test "x$with_mowgli2" = "xyes"; then
- 	PKG_CHECK_MODULES(MOWGLI, [libmowgli-2 >= 0.9.90],
- 		[MOWGLI_SOURCE="system"], [
-