From fde47e0929552e9a5c14249fd0f4cd65facdddfc Mon Sep 17 00:00:00 2001 From: Luca Longinotti Date: Sun, 14 Jan 2007 01:30:54 +0000 Subject: [PATCH] Cleanup. Package-Manager: portage-2.1.2_rc4-r8 --- net-www/mod_auth_pgsql/ChangeLog | 12 +++++-- .../files/80_mod_auth_pgsql.conf | 2 +- .../files/80_mod_auth_pgsql_ap1.conf | 6 ++++ .../files/digest-mod_auth_pgsql-0.9.12-r1 | 2 ++ net-www/mod_auth_pgsql/metadata.xml | 4 +-- .../mod_auth_pgsql-0.9.12-r1.ebuild | 34 +++++++++++-------- .../mod_auth_pgsql-2.0.3-r1.ebuild | 22 ++++++------ 7 files changed, 53 insertions(+), 29 deletions(-) create mode 100644 net-www/mod_auth_pgsql/files/80_mod_auth_pgsql_ap1.conf diff --git a/net-www/mod_auth_pgsql/ChangeLog b/net-www/mod_auth_pgsql/ChangeLog index e288b794a2b3..1f1ec681c721 100644 --- a/net-www/mod_auth_pgsql/ChangeLog +++ b/net-www/mod_auth_pgsql/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-www/mod_auth_pgsql -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pgsql/ChangeLog,v 1.31 2006/08/26 21:53:54 nakano Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pgsql/ChangeLog,v 1.32 2007/01/14 01:30:54 chtekk Exp $ + + 14 Jan 2007; Luca Longinotti + -files/0.9.12-r1/80_mod_auth_pgsql.conf, + -files/2.0.2-r2/80_mod_auth_pgsql.conf, files/80_mod_auth_pgsql.conf, + +files/80_mod_auth_pgsql_ap1.conf, metadata.xml, + mod_auth_pgsql-0.9.12-r1.ebuild, -mod_auth_pgsql-2.0.3.ebuild, + mod_auth_pgsql-2.0.3-r1.ebuild: + Cleanup, fixup. *mod_auth_pgsql-2.0.3-r1 (26 Aug 2006) diff --git a/net-www/mod_auth_pgsql/files/80_mod_auth_pgsql.conf b/net-www/mod_auth_pgsql/files/80_mod_auth_pgsql.conf index f9ed35874f57..6bdf05541c5d 100644 --- a/net-www/mod_auth_pgsql/files/80_mod_auth_pgsql.conf +++ b/net-www/mod_auth_pgsql/files/80_mod_auth_pgsql.conf @@ -1,6 +1,6 @@ - LoadModule auth_pgsql_module extramodules/mod_auth_pgsql.so + LoadModule auth_pgsql_module modules/mod_auth_pgsql.so diff --git a/net-www/mod_auth_pgsql/files/80_mod_auth_pgsql_ap1.conf b/net-www/mod_auth_pgsql/files/80_mod_auth_pgsql_ap1.conf new file mode 100644 index 000000000000..6bdf05541c5d --- /dev/null +++ b/net-www/mod_auth_pgsql/files/80_mod_auth_pgsql_ap1.conf @@ -0,0 +1,6 @@ + + + LoadModule auth_pgsql_module modules/mod_auth_pgsql.so + + + diff --git a/net-www/mod_auth_pgsql/files/digest-mod_auth_pgsql-0.9.12-r1 b/net-www/mod_auth_pgsql/files/digest-mod_auth_pgsql-0.9.12-r1 index 8f44a1dcbb93..892b91ebbc02 100644 --- a/net-www/mod_auth_pgsql/files/digest-mod_auth_pgsql-0.9.12-r1 +++ b/net-www/mod_auth_pgsql/files/digest-mod_auth_pgsql-0.9.12-r1 @@ -1 +1,3 @@ MD5 7be403b7487c13cdb023cc526ee2e13a mod_auth_pgsql-0.9.12.tar.gz 30527 +RMD160 c3e3455c7dbd0bc8dbb12104065dae666969820d mod_auth_pgsql-0.9.12.tar.gz 30527 +SHA256 f6876bfdb788395307d1e1f27a7b6ab5e0318e64393df352102e78bb043c1e44 mod_auth_pgsql-0.9.12.tar.gz 30527 diff --git a/net-www/mod_auth_pgsql/metadata.xml b/net-www/mod_auth_pgsql/metadata.xml index 07556bdbee52..efebb66c3324 100644 --- a/net-www/mod_auth_pgsql/metadata.xml +++ b/net-www/mod_auth_pgsql/metadata.xml @@ -1,6 +1,6 @@ -postgresql -apache + apache + postgresql diff --git a/net-www/mod_auth_pgsql/mod_auth_pgsql-0.9.12-r1.ebuild b/net-www/mod_auth_pgsql/mod_auth_pgsql-0.9.12-r1.ebuild index 430552b5521c..505ab6e683a4 100644 --- a/net-www/mod_auth_pgsql/mod_auth_pgsql-0.9.12-r1.ebuild +++ b/net-www/mod_auth_pgsql/mod_auth_pgsql-0.9.12-r1.ebuild @@ -1,20 +1,22 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pgsql/mod_auth_pgsql-0.9.12-r1.ebuild,v 1.4 2005/06/06 18:58:14 nakano Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pgsql/mod_auth_pgsql-0.9.12-r1.ebuild,v 1.5 2007/01/14 01:30:54 chtekk Exp $ -inherit apache-module +inherit apache-module multilib + +KEYWORDS="~amd64 ~x86" DESCRIPTION="This module allows user authentication (and can log authentication requests) against information stored in a PostgreSQL database." HOMEPAGE="http://www.giuseppetanzilli.it/mod_auth_pgsql/" SRC_URI="http://www.giuseppetanzilli.it/mod_auth_pgsql/dist/${P}.tar.gz" - -KEYWORDS="~x86 ~amd64" LICENSE="freedist" SLOT="1" -DEPEND="dev-db/postgresql" IUSE="" -APACHE1_MOD_CONF="${PVR}/80_mod_auth_pgsql" +DEPEND="dev-db/libpq" +RDEPEND="${DEPEND}" + +APACHE1_MOD_CONF="80_mod_auth_pgsql_ap1" APACHE1_MOD_DEFINE="AUTH_PGSQL" DOCFILES="INSTALL README mod_auth_pgsql.html" @@ -22,15 +24,19 @@ DOCFILES="INSTALL README mod_auth_pgsql.html" need_apache1 src_compile() { - econf --with-apxs=${APXS1} --with-pgsql-lib=/usr/lib/postgresql \ - --with-pgsql-include=/usr/include/postgresql || die "econf failed" - ${APXS1} -I/usr/include/postgresql \ - -L/usr/lib/postgresql -lpq \ - -o mod_auth_pgsql.so -c mod_auth_pgsql.c auth_pgsql_shared_stub.c || die + econf \ + --with-apxs=${APXS1} \ + --with-pgsql-include=/usr/include/postgresql \ + --with-pgsql-lib=/usr/$(get_libdir)/postgresql \ + || die "econf failed" + ${APXS1} \ + -I/usr/include/postgresql \ + -L/usr/$(get_libdir)/postgresql -lpq \ + -o mod_auth_pgsql.so -c mod_auth_pgsql.c auth_pgsql_shared_stub.c \ + || die "apxs make failed" } src_install() { apache-module_src_install - fperms 600 ${APACHE2_MODULES_CONFDIR}/$(basename ${APACHE2_MOD_CONF}).conf + fperms 600 "${APACHE1_MODULES_CONFDIR}"/$(basename ${APACHE1_MOD_CONF}).conf } - diff --git a/net-www/mod_auth_pgsql/mod_auth_pgsql-2.0.3-r1.ebuild b/net-www/mod_auth_pgsql/mod_auth_pgsql-2.0.3-r1.ebuild index b45e66e3fe22..042442fc844b 100644 --- a/net-www/mod_auth_pgsql/mod_auth_pgsql-2.0.3-r1.ebuild +++ b/net-www/mod_auth_pgsql/mod_auth_pgsql-2.0.3-r1.ebuild @@ -1,29 +1,31 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pgsql/mod_auth_pgsql-2.0.3-r1.ebuild,v 1.1 2006/08/26 21:53:54 nakano Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_pgsql/mod_auth_pgsql-2.0.3-r1.ebuild,v 1.2 2007/01/14 01:30:54 chtekk Exp $ -inherit apache-module +inherit apache-module multilib + +KEYWORDS="amd64 ppc ~sparc x86" DESCRIPTION="This module allows user authentication (and can log authentication requests) against information stored in a PostgreSQL database." HOMEPAGE="http://www.giuseppetanzilli.it/mod_auth_pgsql2/" SRC_URI="http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/${P}.tar.gz" - -KEYWORDS="~amd64 ~ppc ~sparc ~x86" LICENSE="freedist" SLOT="2" -DEPEND="dev-db/libpq" IUSE="" -APXS2_ARGS="-a -c -I /usr/pgsql/include -L /usr/pgsql/lib -lpq mod_auth_pgsql.c" +DEPEND="dev-db/libpq" +RDEPEND="${DEPEND}" + +APXS2_ARGS="-a -c -I/usr/include/postgresql -L/usr/$(get_libdir)/postgresql -lpq mod_auth_pgsql.c" -APACHE2_MOD_CONF="2.0.2-r2/80_mod_auth_pgsql" +APACHE2_MOD_CONF="80_mod_auth_pgsql" APACHE2_MOD_DEFINE="AUTH_PGSQL" -DOCFILES="INSTALL README TODO mod_auth_pgsql.html" +DOCFILES="INSTALL README mod_auth_pgsql.html" need_apache2 src_install() { apache-module_src_install - fperms 600 ${APACHE2_MODULES_CONFDIR}/$(basename ${APACHE2_MOD_CONF}).conf + fperms 600 "${APACHE2_MODULES_CONFDIR}"/$(basename ${APACHE2_MOD_CONF}).conf } -- 2.26.2