diff options
| author |   Wulf Krueger <philantrop@gentoo.org> | 2007-08-06 21:46:45 +0000 |
|---|---|---|
| committer | Wulf Krueger <philantrop@gentoo.org> | 2007-08-06 21:46:45 +0000 |
| commit | 054bc4a91bfcff6f5498820d3348d1c462794ca5 (patch) | |
| tree | 6361fd4cbdfe572206b09d8c0c9201446e828fb3 | |
| parent | Version bump to the latest release. Includes optional support for gsasl. (diff) | |
| download | philantrop-054bc4a91bfcff6f5498820d3348d1c462794ca5.tar.gz philantrop-054bc4a91bfcff6f5498820d3348d1c462794ca5.tar.bz2 philantrop-054bc4a91bfcff6f5498820d3348d1c462794ca5.zip | |
Fixed some stupid mistakes.
svn path=/trunk/; revision=27
| -rw-r--r-- | net-im/jabberd/ChangeLog | 4 | ||||
| -rw-r--r-- | net-im/jabberd/Manifest | 16 | ||||
| -rw-r--r-- | net-im/jabberd/jabberd-2.1.12.ebuild | 14 |
3 files changed, 22 insertions, 12 deletions
diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog index 5221d1a..eccc7bd 100644 --- a/net-im/jabberd/ChangeLog +++ b/net-im/jabberd/ChangeLog @@ -3,6 +3,10 @@ # $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.100 2007/06/16 15:34:02 dertobi123 Exp $ 06 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org> + jabberd-2.1.12.ebuild: + Fixed some stupid mistakes about USE flags handling and dependencies. + + 06 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org> +files/jabberd-2.1.12.init, +metadata.xml, +jabberd-2.1.12.ebuild: Version bump to the latest release. Includes optional support for gsasl. diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest index 72fe8c1..bccc414 100644 --- a/net-im/jabberd/Manifest +++ b/net-im/jabberd/Manifest @@ -3,14 +3,14 @@ MD5 54b8406f9b09bc7d8355417e0716edb4 files/jabberd-2.1.12.init 1525 RMD160 a3149ca68f3089ecb2e054756041ad2476947574 files/jabberd-2.1.12.init 1525 SHA256 e9898a4a4a452d1d642f59d36a4d22ec4e914207f7f7846e1ed33a589ecd39df files/jabberd-2.1.12.init 1525 DIST jabberd-2.1.12.tar.gz 1397306 RMD160 5b5067f8ed35c6f71c12696e96ff8d054437097a SHA1 a8e3d8aecb6c50e63e218523562a1cd77392a780 SHA256 052af1fd8a7e4de78dae923700fea145235e645c16c656518e2b7f0304397749 -EBUILD jabberd-2.1.12.ebuild 2508 RMD160 cdc219bcb5b77c68bbd19f8c01195c7a3e5eafd0 SHA1 adf720fbb242fcdabe496956bd9d82bb786193ae SHA256 33fe69dc032d6fd9a3307191c38fb47e2eae424ead277b32303588200e7856cf -MD5 a72c9251e755dc00268b3c80619f2931 jabberd-2.1.12.ebuild 2508 -RMD160 cdc219bcb5b77c68bbd19f8c01195c7a3e5eafd0 jabberd-2.1.12.ebuild 2508 -SHA256 33fe69dc032d6fd9a3307191c38fb47e2eae424ead277b32303588200e7856cf jabberd-2.1.12.ebuild 2508 -MISC ChangeLog 16214 RMD160 1a0c75ce43a3b1bd382ce3ed8c7492e9f5458481 SHA1 57bea6f1f6faf88f599438f12dfd7f2437c51f52 SHA256 273a7632e7715b95257b40956feb27f3d73832fac23d73034cf8e57d9e55c263 -MD5 ccf7de606105faca16c3f54add676a2b ChangeLog 16214 -RMD160 1a0c75ce43a3b1bd382ce3ed8c7492e9f5458481 ChangeLog 16214 -SHA256 273a7632e7715b95257b40956feb27f3d73832fac23d73034cf8e57d9e55c263 ChangeLog 16214 +EBUILD jabberd-2.1.12.ebuild 2757 RMD160 8a9fae2df4151ba0012af4a3ac7910b7567027b4 SHA1 7773156d4661f09388846547aeeb8a38b91fdb55 SHA256 5a437d26337f5d49b326d8b2e884f6f0b1d9a475cf449e70dc5d70e75d99c617 +MD5 45d1f0126eb11b6fdb0c000e588405d8 jabberd-2.1.12.ebuild 2757 +RMD160 8a9fae2df4151ba0012af4a3ac7910b7567027b4 jabberd-2.1.12.ebuild 2757 +SHA256 5a437d26337f5d49b326d8b2e884f6f0b1d9a475cf449e70dc5d70e75d99c617 jabberd-2.1.12.ebuild 2757 +MISC ChangeLog 16367 RMD160 0b363e863aaa34cf363df9d25a4ca1e34c0d6dd2 SHA1 723c83a37da1c04b2ce88cbe2f1506ae134c5cd7 SHA256 539c984d54a788014d1985cb2d5b417b3b12a08a84cb234043841b2c866158c4 +MD5 7aeb908d279e53be02897574ae71637c ChangeLog 16367 +RMD160 0b363e863aaa34cf363df9d25a4ca1e34c0d6dd2 ChangeLog 16367 +SHA256 539c984d54a788014d1985cb2d5b417b3b12a08a84cb234043841b2c866158c4 ChangeLog 16367 MISC metadata.xml 515 RMD160 b5cb7e85c1a974a72a4c8005929ab606ed4c0984 SHA1 909bf6c7c362a30f06c04870454de338f5f070e7 SHA256 5f30ffc2f104453847ccfb8f37f647e5e20a40896620765cf8965ac3a635c9f6 MD5 cf7552103edb4e062cea986875a624f5 metadata.xml 515 RMD160 b5cb7e85c1a974a72a4c8005929ab606ed4c0984 metadata.xml 515 diff --git a/net-im/jabberd/jabberd-2.1.12.ebuild b/net-im/jabberd/jabberd-2.1.12.ebuild index d3504aa..c01acbb 100644 --- a/net-im/jabberd/jabberd-2.1.12.ebuild +++ b/net-im/jabberd/jabberd-2.1.12.ebuild @@ -11,12 +11,14 @@ SRC_URI="http://ftp.xiaoka.com/${PN}2/releases/${P}.tar.gz" SLOT="0" LICENSE="GPL-2" KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="debug memdebug ipv6 ldap mysql pam pipe postgres sqlite gsasl" +IUSE="debug memdebug ipv6 ldap mysql pam pipe postgres sqlite cyrus-sasl gsasl" DEPEND=">=net-im/jabber-base-0.01 dev-libs/expat dev-libs/openssl - dev-libs/cyrus-sasl + cyrus-sasl? ( dev-libs/cyrus-sasl ) + gsasl? ( >=net-libs/libgsasl-0.2.18 ) + !gsasl? ( dev-libs/cyrus-sasl ) net-dns/libidn ldap? ( net-nds/openldap ) >=sys-libs/db-4.1.24 @@ -29,8 +31,12 @@ DEPEND=">=net-im/jabber-base-0.01 src_compile() { local localconf= - if use !gsasl; then - localconf="${localconf} --disable-gsasl --enable-cyrus" + if use cyrus-sasl && ! use gsasl; then + localconf="${localconf} --enable-sasl=cyrus" + elif use gsasl && ! use cyrus-sasl; then + localconf="${localconf} --enable-sasl=gsasl" + else + localconf="${localconf} --enable-sasl=cyrus" fi if use debug; then |