Added sqlite USE flag.

Package-Manager: portage-2.1.2_pre2-r2

4 files changed, 52 insertions, 51 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index 2112ccda7f07..054dd710c4eb 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/jabberd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.79 2006/10/04 20:48:58 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.80 2006/10/04 21:27:45 nelchael Exp $
+
+  04 Oct 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/jabberd-2.0.11-configure.in.patch, jabberd-2.0.11-r1.ebuild:
+  Added sqlite USE flag.
 
 *jabberd-2.0.11-r1 (04 Oct 2006)
 
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index f632e2c8e5a4..0712da421fe0 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -65,6 +65,10 @@ AUX jabberd-1.4.4.init 554 RMD160 83098dfae23a67267dffeb5609e572b501fa9a8e SHA1
 MD5 3b4be327293fb0abc0cdb5dcac80d033 files/jabberd-1.4.4.init 554
 RMD160 83098dfae23a67267dffeb5609e572b501fa9a8e files/jabberd-1.4.4.init 554
 SHA256 769e4ee4e193a1d63fe4839f923fb2a6339489a677595ba75986e19cb1ba39ac files/jabberd-1.4.4.init 554
+AUX jabberd-2.0.11-configure.in.patch 396 RMD160 86c99a761a23e55ebce98bdffba060e18073826f SHA1 59d16a3ce6f30bdea79c67fe9051a6c4624ddac9 SHA256 afa527ce6e4abedf097a92dc73046b8bacd851bf75ea309bd706937c8080aa5f
+MD5 0d6acfc3d4a22d09d4d17ffd202d38d8 files/jabberd-2.0.11-configure.in.patch 396
+RMD160 86c99a761a23e55ebce98bdffba060e18073826f files/jabberd-2.0.11-configure.in.patch 396
+SHA256 afa527ce6e4abedf097a92dc73046b8bacd851bf75ea309bd706937c8080aa5f files/jabberd-2.0.11-configure.in.patch 396
 AUX jabberd-2.0.11.init 624 RMD160 5e41e3be21ae8d5fe95f569c524c19b1c89ba42d SHA1 bcb763873a5db7858bb8dc9ce1331c83120dce10 SHA256 eeda58bb94c29311ff1b738dbbca3fa69dba277cfb84e0c7ff183d258e37bc61
 MD5 cabea842faf5e5b0282b796366de66de files/jabberd-2.0.11.init 624
 RMD160 5e41e3be21ae8d5fe95f569c524c19b1c89ba42d files/jabberd-2.0.11.init 624
@@ -114,18 +118,18 @@ EBUILD jabberd-1.4.4-r3.ebuild 3199 RMD160 9d6fb7f263d2ec56e5134faf593deb7ab656b
 MD5 edeb18c1c4022f1684f0c2f123affd80 jabberd-1.4.4-r3.ebuild 3199
 RMD160 9d6fb7f263d2ec56e5134faf593deb7ab656b817 jabberd-1.4.4-r3.ebuild 3199
 SHA256 3fe6136518958e23e1ff8fd6384ed9f0e112fb1ed4aadb5ad6da2923da9c279e jabberd-1.4.4-r3.ebuild 3199
-EBUILD jabberd-2.0.11-r1.ebuild 2434 RMD160 8e04ca3b7b599696ff219d7ba0625f078cd5e2b8 SHA1 0b2c9a1ce5533898beda3931da36834a402255df SHA256 abcb47bd549e3a11aea58e52448f342b58777ce37bd0c4ede7199231a0665a09
-MD5 2805aaf5e0628d7a1bd8b7e71758d162 jabberd-2.0.11-r1.ebuild 2434
-RMD160 8e04ca3b7b599696ff219d7ba0625f078cd5e2b8 jabberd-2.0.11-r1.ebuild 2434
-SHA256 abcb47bd549e3a11aea58e52448f342b58777ce37bd0c4ede7199231a0665a09 jabberd-2.0.11-r1.ebuild 2434
+EBUILD jabberd-2.0.11-r1.ebuild 2030 RMD160 47ab0f0134026376396628ba5fdd8fc98abfceab SHA1 443e14961b8b14246b45f2eadf94bbf970b6e440 SHA256 69b3470df45a9869ac1a7ecd5407ed04a91b9ea823ca89bc3c887640bba913e3
+MD5 a496b21ab3fdc6e45754c5856a152271 jabberd-2.0.11-r1.ebuild 2030
+RMD160 47ab0f0134026376396628ba5fdd8fc98abfceab jabberd-2.0.11-r1.ebuild 2030
+SHA256 69b3470df45a9869ac1a7ecd5407ed04a91b9ea823ca89bc3c887640bba913e3 jabberd-2.0.11-r1.ebuild 2030
 EBUILD jabberd-2.0.11.ebuild 3492 RMD160 a13a765b26d7322d43e3c54c50650daf59b84794 SHA1 0e73671d2dfa4bae99c2f391ac65a5f06a918d81 SHA256 949c6f68c557bfa68c67e9da9861d5ee434f392b7fd98aed61fb107af6aa9986
 MD5 c96b7efa391c9d83c36732bab36ac7fd jabberd-2.0.11.ebuild 3492
 RMD160 a13a765b26d7322d43e3c54c50650daf59b84794 jabberd-2.0.11.ebuild 3492
 SHA256 949c6f68c557bfa68c67e9da9861d5ee434f392b7fd98aed61fb107af6aa9986 jabberd-2.0.11.ebuild 3492
-MISC ChangeLog 12997 RMD160 17578d5467139aabba5ce0596e569491bfd75cc2 SHA1 e9af9de2ad7cd643386dd87cac46239a272218c2 SHA256 4de20b3726a270765ceac9f78925a7b6713843621f252c630201a3c4fb160bf1
-MD5 95d233b7bf56bb0495d164807f0850fc ChangeLog 12997
-RMD160 17578d5467139aabba5ce0596e569491bfd75cc2 ChangeLog 12997
-SHA256 4de20b3726a270765ceac9f78925a7b6713843621f252c630201a3c4fb160bf1 ChangeLog 12997
+MISC ChangeLog 13146 RMD160 a8b70ed393d3acf30a2a65e24442811afe734dfa SHA1 3b46023e6d8d667a4ba4cbce24dac3aeaeaa44b0 SHA256 0e837a1bf1b620391913ddfbbc23b32c20a13effedf7bf7b81893029957acfd0
+MD5 78a018c2cfab1402347e372942ed94b2 ChangeLog 13146
+RMD160 a8b70ed393d3acf30a2a65e24442811afe734dfa ChangeLog 13146
+SHA256 0e837a1bf1b620391913ddfbbc23b32c20a13effedf7bf7b81893029957acfd0 ChangeLog 13146
 MISC metadata.xml 399 RMD160 e223c713f74619996bc47a70298aa535f6addf09 SHA1 dc9bc290a5ed00f7101aabd3a40b346112eb40eb SHA256 f68b0864864ad54de5cf072835fc9903e709987261ad1fc102afb0019aa52377
 MD5 be8887bde84aab1d4ff9d5a0f5d50141 metadata.xml 399
 RMD160 e223c713f74619996bc47a70298aa535f6addf09 metadata.xml 399
@@ -145,7 +149,7 @@ SHA256 8d5a3e81789ef9e85b365e2974311b0f46ffb940a2b0bfdbc80457e40014f05b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJB5Pgo/w9rxVVVERAsqdAKCLqefaDykpaFNm3ouwLgkhQwZpeACfWlUV
-V/4nXNpSEilzF58P65gIjtM=
-=arDg
+iD8DBQFFJCdngo/w9rxVVVERAjLAAJwJa7DwMxlh1gMm/VWNVfMeabR4LwCfWNPw
+EET6NL81T1F8q4P75lcu0bw=
+=wc+J
 -----END PGP SIGNATURE-----
diff --git a/net-im/jabberd/files/jabberd-2.0.11-configure.in.patch b/net-im/jabberd/files/jabberd-2.0.11-configure.in.patch
new file mode 100644
index 000000000000..64a6697dcc97
--- /dev/null
+++ b/net-im/jabberd/files/jabberd-2.0.11-configure.in.patch
@@ -0,0 +1,13 @@
+diff -Nru jabberd-2.0s11.vanilla/configure.in jabberd-2.0s11/configure.in
+--- jabberd-2.0s11.vanilla/configure.in	2006-10-04 23:14:07.000000000 +0200
++++ jabberd-2.0s11/configure.in	2006-10-04 23:19:58.000000000 +0200
+@@ -758,9 +758,6 @@
+ dnl finishing up
+ dnl
+ 
+-dnl put our config in its own subdir
+-sysconfdir="$sysconfdir/jabberd"
+-
+ dnl done!
+ AC_OUTPUT(Makefile \
+           etc/Makefile \
diff --git a/net-im/jabberd/jabberd-2.0.11-r1.ebuild b/net-im/jabberd/jabberd-2.0.11-r1.ebuild
index 43daaea57040..5f7e493c0f50 100644
--- a/net-im/jabberd/jabberd-2.0.11-r1.ebuild
+++ b/net-im/jabberd/jabberd-2.0.11-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.11-r1.ebuild,v 1.1 2006/10/04 20:48:58 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.11-r1.ebuild,v 1.2 2006/10/04 21:27:45 nelchael Exp $
 
-inherit autotools versionator
+inherit autotools eutils versionator
 
 MY_PV=$(replace_version_separator 2 s)
 
@@ -13,45 +13,26 @@ SRC_URI="http://jabberstudio.2nw.net/${PN}2/${PN}-${MY_PV}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="berkdb debug ipv6 ldap mysql pam pipe postgres ssl"
+IUSE="debug ipv6 ldap mysql pam pipe postgres sqlite ssl"
 
-DEPEND="!=net-im/jabberd-2.0.11
+DEPEND=">=net-im/jabber-base-0.01
 	dev-libs/openssl
 	net-dns/libidn
 	ldap? ( net-nds/openldap )
-	berkdb? ( >=sys-libs/db-4.1.25 )
-	!mysql? (
-		!postgres? ( >=sys-libs/db-4.1.25 )
-	)
+	>=sys-libs/db-4.1.25
 	mysql? ( dev-db/mysql )
-	postgres? ( dev-db/postgresql )"
-RDEPEND="${DEPEND}
-	dev-lang/perl"
+	postgres? ( dev-db/postgresql )
+	sqlite? ( =dev-db/sqlite-3* )
+	!=net-im/jabberd-2.0.11"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
-pkg_setup() {
-
-	if ! use postgres && ! use mysql && ! use berkdb; then
-		ewarn
-		ewarn "For this version of jabberd you should have"
-		ewarn "at least one of 'mysql', 'postgres' and/or 'berkdb'"
-		ewarn "in the USE variable."
-		ewarn
-		ewarn "Compiling with default berkdb support."
-		ewarn
-		ebeep
-	fi
-
-}
-
 src_unpack() {
 
 	unpack ${A}
 	cd "${S}"
 
-	# Remove substituting $sysconfdir with $sysconfdir/jabberd
-	sed -i -e '762s,^,dnl ,' configure.in
+	epatch "${FILESDIR}/${P}-configure.in.patch"
 
 }
 
@@ -59,22 +40,21 @@ src_compile() {
 
 	eautoreconf
 
-	local dbengine=
-	if ! use postgres && ! use mysql && ! use berkdb; then
-		dbengine="--enable-db"
-	else
-		dbengine="$(use_enable mysql) $(use_enable postgres pgsql) $(use_enable berkdb db)"
-	fi
+	local localconf=
+	use debug && localconf="${localconf} --enable-debug --enable-nad-debug --enable-pool-debug"
 
 	econf \
 		--localstatedir=/var \
 		--sysconfdir=/etc/jabber \
-		${dbengine} \
-		$(use_enable pipe) \
-		$(use_enable pam) \
-		$(use_enable ldap) \
+		--enable-db
+		${localconf} \
 		$(use_enable ipv6) \
-		$(use_enable debug) \
+		$(use_enable ldap) \
+		$(use_enable mysql) \
+		$(use_enable pam) \
+		$(use_enable pipe) \
+		$(use_enable postgres pgsql) \
+		$(use_enable sqlite) \
 		|| die "econf failed"
 	emake || die "make failed"