Version bump.

Package-Manager: portage-2.1.2_pre3-r6

6 files changed, 228 insertions, 16 deletions

diff --git a/net-irc/atheme/ChangeLog b/net-irc/atheme/ChangeLog
index 4d04eddb185a..0f7bc5953781 100644
--- a/net-irc/atheme/ChangeLog
+++ b/net-irc/atheme/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/atheme
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme/ChangeLog,v 1.3 2006/04/11 21:09:53 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme/ChangeLog,v 1.4 2006/10/22 12:09:47 swegener Exp $
+
+*atheme-1.2.1 (22 Oct 2006)
+
+  22 Oct 2006; Sven Wegener <swegener@gentoo.org>
+  +files/atheme-1.2.1-postgresl.patch, atheme-0.2.2.ebuild,
+  +atheme-1.2.1.ebuild:
+  Version bump.
 
   11 Apr 2006; Sven Wegener <swegener@gentoo.org> +files/atheme.initd,
   atheme-0.2.2.ebuild:
diff --git a/net-irc/atheme/Manifest b/net-irc/atheme/Manifest
index fd81f6052df0..265409d42447 100644
--- a/net-irc/atheme/Manifest
+++ b/net-irc/atheme/Manifest
@@ -1,31 +1,50 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 74c65dccf6da754c8ac6c9af1886f4bd ChangeLog 672
-RMD160 6c71cb7d7f48e4bf59719b8615d2a5213ea88ee2 ChangeLog 672
-SHA256 0d26b9358bc46f6d445385bc3539a98b2fc346cb3d4985c3b0476357a4ee0199 ChangeLog 672
-MD5 435438123243771ac76024def6f9eb8f atheme-0.2.2.ebuild 2154
-RMD160 f43aa7c954e93120d6ed48d217347d3639ca100f atheme-0.2.2.ebuild 2154
-SHA256 c2364974895e4ed41b1332d4a1f16d7170425f36e9664c82f257f6c67e45f16d atheme-0.2.2.ebuild 2154
+AUX atheme-1.2.1-postgresl.patch 3016 RMD160 a2ad733e1ebb10972478c90d8d7ca1e80df866a8 SHA1 ac4c3cf4ec21c1f839c2d32b954e468a49f5b448 SHA256 68df432beb31e1d5d688979ecb2ee23a176523112d73b25043e709d918c061bd
+MD5 7d09f5e78acd98213cd71c8599314141 files/atheme-1.2.1-postgresl.patch 3016
+RMD160 a2ad733e1ebb10972478c90d8d7ca1e80df866a8 files/atheme-1.2.1-postgresl.patch 3016
+SHA256 68df432beb31e1d5d688979ecb2ee23a176523112d73b25043e709d918c061bd files/atheme-1.2.1-postgresl.patch 3016
+AUX atheme.initd 563 RMD160 80480c20ce2976ca795ff6c08e54d33a79a10f99 SHA1 cf972b2012ca72b0ce088a6e38570d2b5faab6a4 SHA256 679e6f560f397e094128507a7a5fdc6e502cdf58cfa4217c9ffa7834dec1d2c3
 MD5 24e0b066d2829fbd4f21fa4f8ed26f66 files/atheme.initd 563
 RMD160 80480c20ce2976ca795ff6c08e54d33a79a10f99 files/atheme.initd 563
 SHA256 679e6f560f397e094128507a7a5fdc6e502cdf58cfa4217c9ffa7834dec1d2c3 files/atheme.initd 563
-MD5 32977e7658dc4bde7449f16b29f379de files/digest-atheme-0.2.2 229
-RMD160 92977b8b83e9a1eb782ea4da4946e44970c1ce0e files/digest-atheme-0.2.2 229
-SHA256 cea5b5721a9d318cf40f0f410fe1338127499ba640e5290680f27d8feec1f0bd files/digest-atheme-0.2.2 229
+AUX make-postgresql-support-optional.patch 3008 RMD160 6cb50e3b3a817e0305654068b13a8e5863a755f4 SHA1 63114abf6451332031649887482eb77029cc076f SHA256 2ae5171ba545cceeb5f35305cc06a6bdf17d9faa8fb95464cee2a76a81f5ec37
 MD5 fe5c707d98c7536cfde95e9fcbe5117e files/make-postgresql-support-optional.patch 3008
 RMD160 6cb50e3b3a817e0305654068b13a8e5863a755f4 files/make-postgresql-support-optional.patch 3008
 SHA256 2ae5171ba545cceeb5f35305cc06a6bdf17d9faa8fb95464cee2a76a81f5ec37 files/make-postgresql-support-optional.patch 3008
+AUX makefile-DESTDIR-support.patch 4632 RMD160 3afcc77f2f51d728ce0dd81401c6d64f4556bc1a SHA1 2404890bb0a5c499cd3741dcadc83c41e3b4882a SHA256 30592c5c5482a9d4223f1ca9027169dc3502e7d927098ab4809cb4fc56b0e4c8
 MD5 919862d853f6089d8ff610e008bf776b files/makefile-DESTDIR-support.patch 4632
 RMD160 3afcc77f2f51d728ce0dd81401c6d64f4556bc1a files/makefile-DESTDIR-support.patch 4632
 SHA256 30592c5c5482a9d4223f1ca9027169dc3502e7d927098ab4809cb4fc56b0e4c8 files/makefile-DESTDIR-support.patch 4632
+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
+EBUILD atheme-0.2.2.ebuild 2169 RMD160 5918a2a7d5bee5a92b2b46c6d002513ac9d92efa SHA1 e9f103356d341e1e1e8cc5fadc9f42f556e8ff88 SHA256 b76b154e8d4774ce734d14ec3ad01917a4f6d58f90862431558e702e335d1cb6
+MD5 85417b965512a4a5377c8837e62d4187 atheme-0.2.2.ebuild 2169
+RMD160 5918a2a7d5bee5a92b2b46c6d002513ac9d92efa atheme-0.2.2.ebuild 2169
+SHA256 b76b154e8d4774ce734d14ec3ad01917a4f6d58f90862431558e702e335d1cb6 atheme-0.2.2.ebuild 2169
+EBUILD atheme-1.2.1.ebuild 2059 RMD160 065c9d7ec0c21f446c23d5101eada86043fc9a98 SHA1 32614ab13da274eceacd9258816b2f0ae8fb416b SHA256 899af54dd29b6587fea989e1dd922d40f5efd531260b024729cc77ab31fff021
+MD5 e15cc59d191ac537035e73b74e4537ca atheme-1.2.1.ebuild 2059
+RMD160 065c9d7ec0c21f446c23d5101eada86043fc9a98 atheme-1.2.1.ebuild 2059
+SHA256 899af54dd29b6587fea989e1dd922d40f5efd531260b024729cc77ab31fff021 atheme-1.2.1.ebuild 2059
+MISC ChangeLog 852 RMD160 b4164a7286296d20c68e4e26879485745b4c1fb7 SHA1 3b5bc0775a143ffbff74ab9ad58226983cbf4f02 SHA256 b3b71cd3c6d9c8719962db13753c197d99a7883af3cd451137adf650682f3e5f
+MD5 0c2458ecc12c62af521052e385b68529 ChangeLog 852
+RMD160 b4164a7286296d20c68e4e26879485745b4c1fb7 ChangeLog 852
+SHA256 b3b71cd3c6d9c8719962db13753c197d99a7883af3cd451137adf650682f3e5f ChangeLog 852
+MISC metadata.xml 163 RMD160 49f2e0fedf2809839482dd53834531bbfb2ed48b SHA1 5a505722e81c6c98383bae8714738cd616edf8c2 SHA256 723ed38b6537174bee7ee28ce30a61dd5f5f66a1c966da088a9008f20fd9700d
 MD5 dadd013c1aa820e498a4ea28a4615ffd metadata.xml 163
 RMD160 49f2e0fedf2809839482dd53834531bbfb2ed48b metadata.xml 163
 SHA256 723ed38b6537174bee7ee28ce30a61dd5f5f66a1c966da088a9008f20fd9700d metadata.xml 163
+MD5 32977e7658dc4bde7449f16b29f379de files/digest-atheme-0.2.2 229
+RMD160 92977b8b83e9a1eb782ea4da4946e44970c1ce0e files/digest-atheme-0.2.2 229
+SHA256 cea5b5721a9d318cf40f0f410fe1338127499ba640e5290680f27d8feec1f0bd files/digest-atheme-0.2.2 229
+MD5 d5f63d464d4b394ebca0407e0145f9c5 files/digest-atheme-1.2.1 229
+RMD160 f9995640f1d722dd5dfdc721d4428875103b1900 files/digest-atheme-1.2.1 229
+SHA256 cfae8318d16029a4667bca761c68efec73d2c6c2a1af8b222a66ea7d47cd6e3c files/digest-atheme-1.2.1 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEPBsGI1lqEGTUzyQRAnI9AKC7f/x8fQ57RpLR7W99hEgLpe0+4ACg2LIS
-JCLGfVA5LlhKX4ovFKLgCNc=
-=NrKD
+iD8DBQFFO1+YI1lqEGTUzyQRAluwAKCZOfRo7ZCNIwTfGJc+sB15V6l6RQCdGkUW
+OAB60HLBR9/fJ9ctG9AX+FU=
+=Y9nO
 -----END PGP SIGNATURE-----
diff --git a/net-irc/atheme/atheme-0.2.2.ebuild b/net-irc/atheme/atheme-0.2.2.ebuild
index dbe1318fd377..1f46c1b00963 100644
--- a/net-irc/atheme/atheme-0.2.2.ebuild
+++ b/net-irc/atheme/atheme-0.2.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme/atheme-0.2.2.ebuild,v 1.3 2006/04/11 21:09:53 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme/atheme-0.2.2.ebuild,v 1.4 2006/10/22 12:09:47 swegener Exp $
 
 inherit eutils autotools
 
 DESCRIPTION="A portable, secure set of open source, and modular IRC services"
 HOMEPAGE="http://atheme.org/"
-SRC_URI="mirror://gentoo/${P}.tgz"
+SRC_URI="http://www.atheme.org/releases/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-irc/atheme/atheme-1.2.1.ebuild b/net-irc/atheme/atheme-1.2.1.ebuild
new file mode 100644
index 000000000000..8872e0c2b8ae
--- /dev/null
+++ b/net-irc/atheme/atheme-1.2.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme/atheme-1.2.1.ebuild,v 1.1 2006/10/22 12:09:47 swegener Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="A portable, secure set of open source, and modular IRC services"
+HOMEPAGE="http://atheme.org/"
+SRC_URI="http://www.atheme.org/releases/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~sparc ~x86"
+IUSE="largenet postgres"
+
+RDEPEND="postgres? ( dev-db/postgresql )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.59"
+
+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() {
+	einfo
+	einfo "Don't forget to edit /etc/atheme/atheme.conf!"
+	einfo
+}
diff --git a/net-irc/atheme/files/atheme-1.2.1-postgresl.patch b/net-irc/atheme/files/atheme-1.2.1-postgresl.patch
new file mode 100644
index 000000000000..a5ffdcb3d249
--- /dev/null
+++ b/net-irc/atheme/files/atheme-1.2.1-postgresl.patch
@@ -0,0 +1,99 @@
+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/files/digest-atheme-1.2.1 b/net-irc/atheme/files/digest-atheme-1.2.1
new file mode 100644
index 000000000000..a63f719bc24d
--- /dev/null
+++ b/net-irc/atheme/files/digest-atheme-1.2.1
@@ -0,0 +1,3 @@
+MD5 10d71f11dd86f27866cf6a66f110124c atheme-1.2.1.tgz 725341
+RMD160 8a5fe685b79fcf6c800bd7a59b3c21cc29118a99 atheme-1.2.1.tgz 725341
+SHA256 e1eb162e0ce0be8d4f6a45c0210b8a9b5165789d80bb8c9c57ae01d8f781590f atheme-1.2.1.tgz 725341