Drop atheme-services-0.2.2 and atheme-services-1.2.1 which are ancient and affected by bug #313373 and bug #335467.

Package-Manager: portage-2.2.0_alpha37-r1/cvs/Linux x86_64

8 files changed, 23 insertions, 561 deletions

diff --git a/net-irc/atheme-services/ChangeLog b/net-irc/atheme-services/ChangeLog
index b93a1492f52a..9e20539ccd26 100644
--- a/net-irc/atheme-services/ChangeLog
+++ b/net-irc/atheme-services/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/atheme-services
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.2 2011/06/09 04:38:06 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.3 2011/06/09 05:06:46 binki Exp $
+
+  09 Jun 2011; Nathan Phillip Brink <binki@gentoo.org>
+  -atheme-services-0.2.2.ebuild, -atheme-services-1.2.1.ebuild,
+  -files/atheme-1.2.1-postgresl.patch, -files/atheme.initd,
+  -files/make-postgresql-support-optional.patch,
+  -files/makefile-DESTDIR-support.patch:
+  Drop atheme-services-0.2.2 and atheme-services-1.2.1 which are ancient and
+  affected by bug #313373 and bug #335467.
 
 *atheme-services-6.0.8 (09 Jun 2011)
 
diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest
index 9a6139c3c202..95929fac0f86 100644
--- a/net-irc/atheme-services/Manifest
+++ b/net-irc/atheme-services/Manifest
@@ -1,33 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX atheme-1.2.1-postgresl.patch 3016 RMD160 a2ad733e1ebb10972478c90d8d7ca1e80df866a8 SHA1 ac4c3cf4ec21c1f839c2d32b954e468a49f5b448 SHA256 68df432beb31e1d5d688979ecb2ee23a176523112d73b25043e709d918c061bd
 AUX atheme-services.initd.in 1226 RMD160 5f8c08d9852ebbfb45728746231e6e403d315863 SHA1 860fc6cc6d130eeffcdafb6ae6fff51bb6c14ccb SHA256 4199d305397133d34ad15eeaa19b94f6f6b971b33d23cbeeaa0dc5bdb57ca1a6
-AUX atheme.initd 569 RMD160 2549f617e8b45fe6c59f5d41931eee3ff64fda4b SHA1 c129849386ed43003922509818f315adff91c051 SHA256 3af0bf83ee4363bfdf250dc772aa864b83f0675c6c0a6a286bd12b1777aaa39a
-AUX make-postgresql-support-optional.patch 3008 RMD160 6cb50e3b3a817e0305654068b13a8e5863a755f4 SHA1 63114abf6451332031649887482eb77029cc076f SHA256 2ae5171ba545cceeb5f35305cc06a6bdf17d9faa8fb95464cee2a76a81f5ec37
-AUX makefile-DESTDIR-support.patch 4642 RMD160 66deaf6e7df096547cee029b1a2c68f054562835 SHA1 c894d53295780207b5af33360d1a2884b88c850c SHA256 7c247253bd2c0376d976909dfcd923481f746237b0675175e1c4f90fa07f5b5f
-DIST atheme-0.2.2.tgz 297623 RMD160 782338bd3a917b70b3e45bcb913b427e3c788d6c SHA1 ab8c31bbeeff9b7f17fe012d90d5db52eff3b543 SHA256 f8021e63e15858e8b212daf908bd2a51bb72cc6352e9856ade5149a3bdb8e382
-DIST atheme-1.2.1.tgz 725341 RMD160 8a5fe685b79fcf6c800bd7a59b3c21cc29118a99 SHA1 052f9acb72517de51e1aa358e97b871925d8fe08 SHA256 e1eb162e0ce0be8d4f6a45c0210b8a9b5165789d80bb8c9c57ae01d8f781590f
 DIST atheme-services-6.0.8.tar.bz2 860407 RMD160 31c1ba46ee5ede98108b51970bde134b259f1b3b SHA1 d201a41592fe0137e00625d7d6ed99fd79a752a7 SHA256 7dffcf8e768ca442d1fcc2b0e3031c41e34f6b3d8ee47164f84f20cb30515c24
-EBUILD atheme-services-0.2.2.ebuild 2234 RMD160 fb8ba14178df0eca1044b8f960753f60be50d932 SHA1 5afec764b803aaf2020da7092d4dce2933daebf4 SHA256 c9d669dac2a4d43d33cfcad7416446e05b8a3b0cb2c99a918608f0660d7373a3
-EBUILD atheme-services-1.2.1.ebuild 2124 RMD160 4e7d5efbca37bc42ecd3f414006ac2102b171eb2 SHA1 5b9cc37e276192da25f8c196e608af4b64372e60 SHA256 ff4462410fccba986383ce0477cf99341ba33d1c4ac8640bb0d5c26eb892b189
 EBUILD atheme-services-6.0.8.ebuild 2462 RMD160 598f09a8d816551c378b5a6cde51c6fc57c1c618 SHA1 a545d6a99f1e225e69563f5146c40336fa203dc2 SHA256 bb9b215169f03d8c260cc500382ce418801015e24a3d25e6cf7e82f384de8168
-MISC ChangeLog 926 RMD160 836c1f40f22748e22d88d19461a7e3a749295237 SHA1 a60a1ae095393f2f2309ae4def472a3b51d658b9 SHA256 6f51db817a493ee0f8de944b6ab3050b1f3eca0b3c09b125d64bddc3aa56d046
+MISC ChangeLog 1316 RMD160 65e077378d8f24e0abbfdde5c783193d29fc1166 SHA1 80b1edc0866b6db86f949ff3d31ac9e43b1120c6 SHA256 cb94753ba9b183798db93c968de15105e757beeb6a35ec35cfc1f8b6ef275db4
 MISC metadata.xml 416 RMD160 db2173f6430f2ea5ea2215e3a74059d64d35efca SHA1 fed7bb971003549010111868b1c006e73acf0aeb SHA256 dbe17300173ce839acd69943deb141c2fcf56ffa917c95e1a4d823269c0501a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJN8E52AAoJEHQ6UuhrqBBQVKIQAJ4FOP47+IzLFFmQ2QkUtq+/
-VePRJZTnudAujY7UvntrPblgKEtu+8iSZHHFyS2Qk3Rpz+XaHjEbnnx29tJLs9Hg
-maA9HsJDex3kKMTsi+M9jQHluane9nhUypl7Iisuj5TkKUABcSQR1wt8qbKssMSC
-4ne1SbkT4HJSnaHsfr2JfbJyvcY5Of3xh5EAL9ngahBi9eqzqfyHAjru/X0DaWNI
-U0G6kNCckpBJmcaFLpwvEQtep4n+H4a/sHSdH35S2zWlMGafOWZEgq525wrkhoul
-L3ACesPA+uoAWoBDti3PiZQkF2gcVR9u3TA6Ad1Atk0aVFOUwuluPAaIfO8NVaj/
-dDvVS8Ch/9cn2PY8Gh6grkeZ7Xw29i9MbTX22b5IvQt1k/C42uHhE6fRYFNKDGRZ
-PPTp0zbGxIzWODmCGdwndeKoR1ZxM1418wBHY/o2D7kAqe0XeUwuWjv1J/qD1U+i
-6Knuc1sI4AwJtZu8W+fDnJvPsCJ5i9pplfdKlu9DwqEajQ2899TxpqkFyoAViC7F
-0C/xbIeQMM8IVnK45jvfDaT2OnJ6KpP52YxQDNo2RYhmNH13UB8rZWNqOKvDGj0H
-JfnST8dIRPpjWOvpI04tU3cPPQ4IdodkZ2gro1k1yQsUEhsH3b+35RPz+JXyaxqf
-qSmx+8Ezy2vO3I2i7c4k
-=LuuJ
+iQIcBAEBCAAGBQJN8FT0AAoJEHQ6UuhrqBBQbsQQAIGvSkplxzRjw1qcKXakAr2m
+F8lRVEEDv0L8u2U94JLUhk1nu5n1+Qo8n502U67G2Mp1/j6Z5wqeFd3AAzCxKkyX
+RK1WpwtOLcw6NmEZoLsSRC1Gv8nMFWyAVXnkB/7AL6bW70sIq8dSjDPAML3BPwXL
+GqgDs92B5Gvqo1UPiK2m2nemuhEj46WGv7QR1lN7Jk0/BZAXeAOXkaFLcY6Maiep
+SvIK3ao5GQZvAR2B8IRNwl8FtPXmDlSAcd9gH6By0DoLZeK3+e6BWiQGB7/3MUxM
+y9A+U8YzsKtEC8NoT//A4S/SyKGtaE4e6juMoO0d+kIuXyVs+OxNELKJoIVR8Feg
+Qwv9O9zCX4XYP30bCJKr7lutGs1OsrieMngT2IGffgja/YO01w14LReoasCkxeYj
+TI3QLZsPB0WSdPOBimnSJtZuopoQ/z7NueTFcmuHoX+25bEsNvFaXhmfCFWlv13S
+bjrv4FKs9boHNGD3MoNdLOyWW0BOZvL8OuoBy3/DIHqgoZTwELnWrQm1J/F2EhwP
+BxjnGN/j90cDqP8piiCeRFOnDeavkNhBbInu7hfCDdoIoVRvlaiix0as9iRhdzwn
+TfPRCoLLfTuXgQig6SOxtndoepu0FU3BgkJroOKS96VROPPLx3rKyAaio8Q1B1Cw
+G5vcKzuCGGt6YRNEj9BP
+=XNSu
 -----END PGP SIGNATURE-----
diff --git a/net-irc/atheme-services/atheme-services-0.2.2.ebuild b/net-irc/atheme-services/atheme-services-0.2.2.ebuild
deleted file mode 100644
index 150e1da2f8c9..000000000000
--- a/net-irc/atheme-services/atheme-services-0.2.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-0.2.2.ebuild,v 1.1 2011/06/08 00:45:34 binki Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="A portable, secure set of open source, and modular IRC services"
-HOMEPAGE="http://www.atheme.net/"
-SRC_URI="http://distfiles.atheme.org/atheme-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~sparc ~x86 ~x86-fbsd"
-IUSE="largenet postgres"
-
-RDEPEND="postgres? ( dev-db/postgresql-server )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.59"
-
-S=${WORKDIR}/atheme-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/make-postgresql-support-optional.patch || die "epacth failed"
-	epatch ${FILESDIR}/makefile-DESTDIR-support.patch || die "epatch failed"
-
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		--prefix=/var/lib/atheme \
-		$(use_with postgresql) \
-		$(use_with largenet large-net) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	local dir
-
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodir /{etc,usr/{lib,share}}/atheme
-	keepdir /var/lib/atheme/var
-	fowners atheme:atheme /etc/atheme /var/lib/atheme/var
-	fperms 750 /etc/atheme /var/lib/atheme/var
-
-	for dir in backend contrib modules protocol
-	do
-		mv "${D}"/var/lib/atheme/${dir} "${D}"/usr/lib/atheme
-		dosym /usr/lib/atheme/${dir} /var/lib/atheme
-	done
-
-	mv "${D}"/var/lib/atheme/help "${D}"/usr/share/atheme
-	dosym /usr/share/atheme/help /var/lib/atheme
-
-	mv "${D}"/var/lib/atheme/etc/example.conf ${D}/etc/atheme/atheme.conf
-	fowners root:atheme /etc/atheme/atheme.conf
-	fperms 640 /etc/atheme/atheme.conf
-
-	rm -rf "${D}"/var/lib/atheme/etc
-	dosym /etc/atheme /var/lib/atheme/etc
-
-	dobin "${D}"/var/lib/atheme/bin/atheme || die "dobin failed"
-
-	dodoc \
-		ChangeLog INSTALL README \
-		doc/{example_module.c,LICENSE,POSTGRESQL,RELEASE,ROADMAP} \
-		|| die "dodoc failed"
-
-	newinitd "${FILESDIR}"/atheme.initd atheme
-
-	# And remove stuff we don't need
-	rm -rf "${D}"/var/lib/atheme/{bin,doc}
-}
-
-pkg_setup() {
-	enewgroup atheme
-	enewuser atheme -1 -1 /var/lib/atheme atheme
-}
-
-pkg_postinst() {
-	elog
-	elog "Don't forget to edit /etc/atheme/atheme.conf!"
-	elog
-}
diff --git a/net-irc/atheme-services/atheme-services-1.2.1.ebuild b/net-irc/atheme-services/atheme-services-1.2.1.ebuild
deleted file mode 100644
index a38d4c7b9ade..000000000000
--- a/net-irc/atheme-services/atheme-services-1.2.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-1.2.1.ebuild,v 1.1 2011/06/08 00:45:34 binki Exp $
-
-inherit eutils autotools
-
-DESCRIPTION="A portable, secure set of open source, and modular IRC services"
-HOMEPAGE="http://www.atheme.net/"
-SRC_URI="http://distfiles.atheme.org/atheme-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~sparc ~x86 ~x86-fbsd"
-IUSE="largenet postgres"
-
-RDEPEND="postgres? ( dev-db/postgresql-server )"
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.59"
-
-S=${WORKDIR}/atheme-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/atheme-1.2.1-postgresl.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	econf \
-		--prefix=/var/lib/atheme \
-		$(use_enable postgresql) \
-		$(use_with largenet large-net) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make prefix="${D}"/var/lib/atheme install || die "make install failed"
-
-	dodir /usr/{lib,share}/atheme /etc
-	keepdir /var/lib/atheme/var
-	fowners atheme:atheme /var/lib/atheme/var
-	fperms 750 /var/lib/atheme/var
-
-	local dir
-	for dir in backend crypto modules protocol
-	do
-		mv "${D}"/var/lib/atheme/${dir} "${D}"/usr/lib/atheme
-		dosym /usr/lib/atheme/${dir} /var/lib/atheme/${dir}
-	done
-
-	mv "${D}"/var/lib/atheme/help "${D}"/usr/share/atheme
-	dosym /usr/share/atheme/help /var/lib/atheme/help
-
-	mv "${D}"/var/lib/atheme/etc "${D}"/etc/atheme
-	cp "${D}"/etc/atheme/example.conf "${D}"/etc/atheme/atheme.conf
-	fowners root:atheme /etc/atheme/atheme.conf
-	fperms 640 /etc/atheme/atheme.conf
-	dosym /etc/atheme /var/lib/atheme/etc
-
-	dobin "${D}"/var/lib/atheme/bin/atheme || die "dobin failed"
-
-	dodoc \
-		ChangeLog INSTALL README \
-		doc/{example_module.c,LICENSE,SQL,RELEASE} \
-		|| die "dodoc failed"
-
-	newinitd "${FILESDIR}"/atheme.initd atheme
-
-	# And remove stuff we don't need
-	rm -rf "${D}"/var/lib/atheme/{bin,doc}
-}
-
-pkg_setup() {
-	enewgroup atheme
-	enewuser atheme -1 -1 /var/lib/atheme atheme
-}
-
-pkg_postinst() {
-	elog
-	elog "Don't forget to edit /etc/atheme/atheme.conf!"
-	elog
-}
diff --git a/net-irc/atheme-services/files/atheme-1.2.1-postgresl.patch b/net-irc/atheme-services/files/atheme-1.2.1-postgresl.patch
deleted file mode 100644
index a5ffdcb3d249..000000000000
--- a/net-irc/atheme-services/files/atheme-1.2.1-postgresl.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -Nur atheme-1.2.1.orig/configure.ac atheme-1.2.1/configure.ac
---- atheme-1.2.1.orig/configure.ac	2006-07-10 13:23:14.000000000 +0000
-+++ atheme-1.2.1/configure.ac	2006-10-22 11:52:40.281188612 +0000
-@@ -196,43 +196,61 @@
- 
- POSTGRESQL="yes"
- 
--AC_MSG_CHECKING(for PostgreSQL include directory)
--if test -d /usr/include/pgsql ; then
-- 	pg_inc_dir="/usr/include/pgsql"
--elif test -f /usr/local/include/libpq-fe.h ; then
--# kludge for freebsd ports, found on liveharmony boxes. --nenolod
--	pg_inc_dir="/usr/local/include"
--	LDFLAGS="-L/usr/local/lib"
--elif test -d /usr/include/postgresql ; then
-- 	pg_inc_dir="/usr/include/postgresql"
--elif test -d /usr/local/psql/include ; then
-- 	pg_inc_dir="/usr/local/psql/include"
--elif test -d /usr/local/include/postgresql ; then
--	pg_inc_dir="/usr/local/include/postgresql"
--elif test -d /usr/local/pgsql/include ; then
--	pg_inc_dir="/usr/local/pgsql/include"
--elif test -d /usr/local/include/psql ; then
--	pg_inc_dir="/usr/local/include/psql"
--elif test -d /opt/psql/include ; then
-- 	pg_inc_dir="/opt/psql/include"
--else
--	pg_inc_dir="no"
-- 	PQLIB=""
--	POSTGRESQL="no"
--fi
-+AC_ARG_ENABLE(postgresql,
-+AC_HELP_STRING([--enable-postgresql], [Enables PostgreSQL backend support.]),
-+[
-+	case "$enableval" in
-+		yes|no)
-+			POSTGRESQL="$enableval"
-+			;;
-+		*)
-+			AC_MSG_ERROR([Invalid argument to --enable-postgresql (expecting either 'yes' or 'no')])
-+			;;
-+	esac
-+])
-+ 
-+AC_MSG_CHECKING([whether to enable PostgreSQL backend support])
-+AC_MSG_RESULT($POSTGRESQL)
-+ 
-+if test "x$POSTGRESQL" = xyes; then
-+	AC_MSG_CHECKING(for PostgreSQL include directory)
-+	if test -d /usr/include/pgsql ; then
-+ 		pg_inc_dir="/usr/include/pgsql"
-+	elif test -f /usr/local/include/libpq-fe.h ; then
-+	# kludge for freebsd ports, found on liveharmony boxes. --nenolod
-+		pg_inc_dir="/usr/local/include"
-+		LDFLAGS="-L/usr/local/lib"
-+	elif test -d /usr/include/postgresql ; then
-+ 		pg_inc_dir="/usr/include/postgresql"
-+	elif test -d /usr/local/psql/include ; then
-+ 		pg_inc_dir="/usr/local/psql/include"
-+	elif test -d /usr/local/include/postgresql ; then
-+		pg_inc_dir="/usr/local/include/postgresql"
-+	elif test -d /usr/local/pgsql/include ; then
-+		pg_inc_dir="/usr/local/pgsql/include"
-+	elif test -d /usr/local/include/psql ; then
-+		pg_inc_dir="/usr/local/include/psql"
-+	elif test -d /opt/psql/include ; then
-+ 		pg_inc_dir="/opt/psql/include"
-+	else
-+		pg_inc_dir="no"
-+	 	PQLIB=""
-+		POSTGRESQL="no"
-+	fi
- 
--POSTGRESQL_C=""
-+	POSTGRESQL_C=""
- 
--AC_MSG_RESULT($pg_inc_dir)
-+	AC_MSG_RESULT($pg_inc_dir)
- 
--if test "$pg_inc_dir" != "no"; then
--	AC_CHECK_HEADER($pg_inc_dir/libpq-fe.h, [
--		PGINC="-I$pg_inc_dir"
--	AC_CHECK_LIB(pq, PQconnectdb, [PQLIB="-lpq"
--		POSTGRESQL_C="postgresql.c"])
--	])
--else
--	POSTGRESQL="no"
-+	if test "$pg_inc_dir" != "no"; then
-+		AC_CHECK_HEADER($pg_inc_dir/libpq-fe.h, [
-+			PGINC="-I$pg_inc_dir"
-+		AC_CHECK_LIB(pq, PQconnectdb, [PQLIB="-lpq"
-+			POSTGRESQL_C="postgresql.c"])
-+		])
-+	else
-+		POSTGRESQL="no"
-+	fi
- fi
- 
- AC_SUBST(POSTGRESQL_C)
diff --git a/net-irc/atheme-services/files/atheme.initd b/net-irc/atheme-services/files/atheme.initd
deleted file mode 100644
index 8853da092267..000000000000
--- a/net-irc/atheme-services/files/atheme.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/files/atheme.initd,v 1.1 2011/06/08 00:45:35 binki Exp $
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting atheme"
-	start-stop-daemon --start --quiet --chuid atheme --exec /usr/bin/atheme &>/dev/null
-	eend $? "Failed to start atheme"
-}
-
-stop() {
-	ebegin "Stopping atheme"
-	start-stop-daemon --stop --quiet --pidfile /var/lib/atheme/var/atheme.pid
-	eend $? "Failed to stop atheme"
-}
diff --git a/net-irc/atheme-services/files/make-postgresql-support-optional.patch b/net-irc/atheme-services/files/make-postgresql-support-optional.patch
deleted file mode 100644
index edd0d2a9939b..000000000000
--- a/net-irc/atheme-services/files/make-postgresql-support-optional.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -Nup -r atheme-0.2.2/configure.ac atheme-0.2.2.patched/configure.ac
---- atheme-0.2.2/configure.ac	2005-09-03 21:17:30.000000000 +0000
-+++ atheme-0.2.2.patched/configure.ac	2005-09-04 02:16:20.000000000 +0000
-@@ -95,43 +95,61 @@ echo " "
- 
- POSTGRESQL="yes"
- 
--AC_MSG_CHECKING(for PostgreSQL include directory)
--if test -d /usr/include/pgsql ; then
-- 	pg_inc_dir="/usr/include/pgsql"
--elif test -f /usr/local/include/libpq-fe.h ; then
--# kludge for freebsd ports, found on liveharmony boxes. --nenolod
--	pg_inc_dir="/usr/local/include"
--	LDFLAGS="-L/usr/local/lib"
--elif test -d /usr/include/postgresql ; then
-- 	pg_inc_dir="/usr/include/postgresql"
--elif test -d /usr/local/psql/include ; then
-- 	pg_inc_dir="/usr/local/psql/include"
--elif test -d /usr/local/include/postgresql ; then
--	pg_inc_dir="/usr/local/include/postgresql"
--elif test -d /usr/local/pgsql/include ; then
--	pg_inc_dir="/usr/local/include/psql"
--elif test -d /usr/local/include/psql ; then
--	pg_inc_dir="/usr/local/include/psql"
--elif test -d /opt/psql/include ; then
-- 	pg_inc_dir="/opt/psql/include"
--else
--	pg_inc_dir="no"
-- 	PQLIB=""
--	POSTGRESQL="no"
--fi
-+AC_ARG_WITH(postgresql,
-+AC_HELP_STRING([--with-postgresql],[ Enables PostgreSQL backend support.]),
-+[
-+	case "$withval" in
-+		yes|no)
-+			POSTGRESQL="$withval"
-+			;;
-+		*)
-+			AC_MSG_ERROR([Invalid argument to --with-postgresql (expecting either 'yes' or 'no')])
-+			;;
-+	esac
-+])
- 
--POSTGRESQL_C=""
-+AC_MSG_CHECKING([whether to enable PostgreSQL backend support])
-+AC_MSG_RESULT($POSTGRESQL)
- 
--AC_MSG_RESULT($pg_inc_dir)
-+if test "x$POSTGRESQL" = xyes; then
-+	AC_MSG_CHECKING(for PostgreSQL include directory)
-+	if test -d /usr/include/pgsql ; then
-+		pg_inc_dir="/usr/include/pgsql"
-+	elif test -f /usr/local/include/libpq-fe.h ; then
-+		# kludge for freebsd ports, found on liveharmony boxes. --nenolod
-+		pg_inc_dir="/usr/local/include"
-+		LDFLAGS="-L/usr/local/lib"
-+	elif test -d /usr/include/postgresql ; then
-+		pg_inc_dir="/usr/include/postgresql"
-+	elif test -d /usr/local/psql/include ; then
-+		pg_inc_dir="/usr/local/psql/include"
-+	elif test -d /usr/local/include/postgresql ; then
-+		pg_inc_dir="/usr/local/include/postgresql"
-+	elif test -d /usr/local/pgsql/include ; then
-+		pg_inc_dir="/usr/local/include/psql"
-+	elif test -d /usr/local/include/psql ; then
-+		pg_inc_dir="/usr/local/include/psql"
-+	elif test -d /opt/psql/include ; then
-+		pg_inc_dir="/opt/psql/include"
-+	else
-+		pg_inc_dir="no"
-+		PQLIB=""
-+		POSTGRESQL="no"
-+	fi
- 
--if test "$pg_inc_dir" != "no"; then
--	AC_CHECK_HEADER($pg_inc_dir/libpq-fe.h, [
--		PGINC="-I$pg_inc_dir"
--	AC_CHECK_LIB(pq, PQconnectdb, PQLIB="-lpq")
--	POSTGRESQL_C="postgresql.c"
--	])
--else
--	POSTGRESQL="no"
-+	POSTGRESQL_C=""
-+
-+	AC_MSG_RESULT($pg_inc_dir)
-+
-+	if test "$pg_inc_dir" != "no"; then
-+		AC_CHECK_HEADER($pg_inc_dir/libpq-fe.h, [
-+			PGINC="-I$pg_inc_dir"
-+		AC_CHECK_LIB(pq, PQconnectdb, PQLIB="-lpq")
-+		POSTGRESQL_C="postgresql.c"
-+		])
-+	else
-+		POSTGRESQL="no"
-+	fi
- fi
- 
- AC_SUBST(POSTGRESQL_C)
diff --git a/net-irc/atheme-services/files/makefile-DESTDIR-support.patch b/net-irc/atheme-services/files/makefile-DESTDIR-support.patch
deleted file mode 100644
index afd307912742..000000000000
--- a/net-irc/atheme-services/files/makefile-DESTDIR-support.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff -Nup -r atheme-0.2.2/backend/Makefile.in atheme-0.2.2.patched/backend/Makefile.in
---- atheme-0.2.2/backend/Makefile.in	2005-09-03 21:17:28.000000000 +0000
-+++ atheme-0.2.2.patched/backend/Makefile.in	2005-09-04 04:15:55.000000000 +0000
-@@ -6,6 +6,8 @@
- # $Id: makefile-DESTDIR-support.patch,v 1.1 2011/06/08 00:45:35 binki Exp $
- #
- 
-+DESTDIR := 
-+
- CC		= @CC@
- RM		= @RM@
- MV		= @MV@
-@@ -36,8 +38,8 @@ all: protocols
- build: all
- 
- install: build
--	${INSTALL} -d ${PREFIX}/backend
--	${INSTALL} -m 755 *.so ${PREFIX}/backend
-+	${INSTALL} -d $(DESTDIR)${PREFIX}/backend
-+	${INSTALL} -m 755 *.so $(DESTDIR)${PREFIX}/backend
- 
- protocols: $(OBJS)
- 
-diff -Nup -r atheme-0.2.2/contrib/Makefile.in atheme-0.2.2.patched/contrib/Makefile.in
---- atheme-0.2.2/contrib/Makefile.in	2005-09-03 21:17:29.000000000 +0000
-+++ atheme-0.2.2.patched/contrib/Makefile.in	2005-09-04 04:15:55.000000000 +0000
-@@ -6,6 +6,8 @@
- # $Id: makefile-DESTDIR-support.patch,v 1.1 2011/06/08 00:45:35 binki Exp $
- #
- 
-+DESTDIR := 
-+
- CC		= @CC@
- RM		= @RM@
- MV		= @MV@
-@@ -38,8 +40,8 @@ all: protocols
- build: all
- 
- install: build
--	${INSTALL} -d ${PREFIX}/contrib
--	${INSTALL} -m 755 *.so ${PREFIX}/contrib
-+	${INSTALL} -d $(DESTDIR)${PREFIX}/contrib
-+	${INSTALL} -m 755 *.so $(DESTDIR)${PREFIX}/contrib
- 
- protocols: $(OBJS)
- 
-diff -Nup -r atheme-0.2.2/modules/Makefile.in atheme-0.2.2.patched/modules/Makefile.in
---- atheme-0.2.2/modules/Makefile.in	2005-09-03 21:17:30.000000000 +0000
-+++ atheme-0.2.2.patched/modules/Makefile.in	2005-09-04 04:15:55.000000000 +0000
-@@ -6,6 +6,8 @@
- # $Id: makefile-DESTDIR-support.patch,v 1.1 2011/06/08 00:45:35 binki Exp $
- #
- 
-+DESTDIR := 
-+
- CC		= @CC@
- RM		= @RM@
- MV		= @MV@
-@@ -36,8 +38,8 @@ all: modules
- build: all
- 
- install: build
--	${INSTALL} -d ${PREFIX}/modules
--	${INSTALL} -m 755 *.so ${PREFIX}/modules
-+	${INSTALL} -d $(DESTDIR)${PREFIX}/modules
-+	${INSTALL} -m 755 *.so $(DESTDIR)${PREFIX}/modules
- 
- modules: $(OBJS)
- 
-diff -Nup -r atheme-0.2.2/protocol/Makefile.in atheme-0.2.2.patched/protocol/Makefile.in
---- atheme-0.2.2/protocol/Makefile.in	2005-09-03 21:17:29.000000000 +0000
-+++ atheme-0.2.2.patched/protocol/Makefile.in	2005-09-04 04:15:55.000000000 +0000
-@@ -6,6 +6,8 @@
- # $Id: makefile-DESTDIR-support.patch,v 1.1 2011/06/08 00:45:35 binki Exp $
- #
- 
-+DESTDIR := 
-+
- CC		= @CC@
- RM		= @RM@
- MV		= @MV@
-@@ -49,8 +51,8 @@ all: protocols
- build: all
- 
- install: build
--	${INSTALL} -d ${PREFIX}/protocol
--	${INSTALL} -m 755 *.so ${PREFIX}/protocol
-+	${INSTALL} -d $(DESTDIR)${PREFIX}/protocol
-+	${INSTALL} -m 755 *.so $(DESTDIR)${PREFIX}/protocol
- 
- protocols: $(OBJS)
- 
-diff -Nup -r atheme-0.2.2/src/Makefile.in atheme-0.2.2.patched/src/Makefile.in
---- atheme-0.2.2/src/Makefile.in	2005-09-03 21:17:29.000000000 +0000
-+++ atheme-0.2.2.patched/src/Makefile.in	2005-09-04 04:15:55.000000000 +0000
-@@ -6,6 +6,8 @@
- # $Id: makefile-DESTDIR-support.patch,v 1.1 2011/06/08 00:45:35 binki Exp $
- #
- 
-+DESTDIR := 
-+
- CC		= @CC@
- RM		= @RM@
- MV		= @MV@
-@@ -70,27 +72,27 @@ atheme: $(OBJS)
- 	$(MV) version.c version.c.last
- 
- install: build
--	$(INSTALL) -m 755 -d $(PREFIX)
--	$(INSTALL) -m 755 -d $(PREFIX)/bin
--	$(INSTALL) -m 755 -d $(PREFIX)/etc
--	$(INSTALL) -m 755 -d $(PREFIX)/var
--	$(INSTALL) -m 755 -c $(BIN) $(PREFIX)/bin
--	$(INSTALL) -m 640 -c ../dist/example.conf $(PREFIX)/etc
--	$(INSTALL) -m 640 -c ../dist/example-traditional.conf $(PREFIX)/etc
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(PREFIX)
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(PREFIX)/bin
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(PREFIX)/etc
-+	$(INSTALL) -m 755 -d $(DESTDIR)$(PREFIX)/var
-+	$(INSTALL) -m 755 -c $(BIN) $(DESTDIR)$(PREFIX)/bin
-+	$(INSTALL) -m 640 -c ../dist/example.conf $(DESTDIR)$(PREFIX)/etc
-+	$(INSTALL) -m 640 -c ../dist/example-traditional.conf $(DESTDIR)$(PREFIX)/etc
- 	if [ ! -r $(PREFIX)/etc/atheme.db ]; then \
--		$(INSTALL) -m 640 -c ../dist/atheme.db $(PREFIX)/etc ; \
-+		$(INSTALL) -m 640 -c ../dist/atheme.db $(DESTDIR)$(PREFIX)/etc ; \
- 	fi
- 	if [ ! -r $(PREFIX)/etc/atheme.chk ]; then \
--		$(INSTALL) -m 640 -c ../dist/atheme.chk $(PREFIX)/etc ; \
-+		$(INSTALL) -m 640 -c ../dist/atheme.chk $(DESTDIR)$(PREFIX)/etc ; \
- 	fi
- 	if [ -e $(PREFIX)/doc ]; then \
--		$(RM) -rf $(PREFIX)/doc ; \
-+		$(RM) -rf $(DESTDIR)$(PREFIX)/doc ; \
- 	fi
- 	if [ -e $(PREFIX)/help ]; then \
--		$(RM) -rf $(PREFIX)/help ; \
-+		$(RM) -rf $(DESTDIR)$(PREFIX)/help ; \
- 	fi
--	$(CP) -R ../doc $(PREFIX)
--	$(CP) -R ../help $(PREFIX)
-+	$(CP) -R ../doc $(DESTDIR)$(PREFIX)
-+	$(CP) -R ../help $(DESTDIR)$(PREFIX)
- 
- 	@echo "----------------------------------------------------------------"
- 	@echo ">>> Remember to cd to ${PREFIX} and edit your config file.";