bump

Package-Manager: portage-2.1.2-r5

diff --git a/net-im/wildfire/ChangeLog b/net-im/wildfire/ChangeLog
index 1c78052587d928742c9326b754cef46ca373d8b9..82096ad733180ef490e830dc49911846354c7cfb 100644 (file)
--- a/net-im/wildfire/ChangeLog
+++ b/net-im/wildfire/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/wildfire
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/ChangeLog,v 1.17 2007/02/05 23:35:29 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/ChangeLog,v 1.18 2007/02/06 00:29:55 humpback Exp $
+
+*wildfire-3.2.0_rc2 (06 Feb 2007)
+
+  06 Feb 2007; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/build.xml-3.2.0_rc2.bz2, +wildfire-3.2.0_rc2.ebuild:
+  Added the lattest RC, p.masked, that includes new SSL system.
 
   05 Feb 2007; Gustavo Felisberto <humpback@gentoo.org>;
   wildfire-3.1.1.ebuild:

diff --git a/net-im/wildfire/Manifest b/net-im/wildfire/Manifest
index 29779f400d4331dd63fc0ccd905b72f81bb090f5..75617cecea73898d81208986f1e9d1fe53578fbc 100644 (file)
--- a/net-im/wildfire/Manifest
+++ b/net-im/wildfire/Manifest
@@ -9,6 +9,10 @@ AUX build.xml-3.1.1.bz2 9211 RMD160 d8d5f4b984b1c2aff35058829774389934d52bb9 SHA
 MD5 0a4fe0850e431e66189492079a30f37e files/build.xml-3.1.1.bz2 9211
 RMD160 d8d5f4b984b1c2aff35058829774389934d52bb9 files/build.xml-3.1.1.bz2 9211
 SHA256 c39ed384ddaa6ae44898641cba04f9c37173cddc75b30fde78fb1143f71ac5bc files/build.xml-3.1.1.bz2 9211
+AUX build.xml-3.2.0_rc2.bz2 7971 RMD160 778d12d6148c648d8b99675109a895242a87ed6c SHA1 0d941cdcf9a14300569fff448d753dfcb52920ba SHA256 5a227829ae936ebf216c3343f512d05197d03abfaa4cb89e2d7f0577a434223d
+MD5 5cdc6e98892a4dae46c314951ff9de69 files/build.xml-3.2.0_rc2.bz2 7971
+RMD160 778d12d6148c648d8b99675109a895242a87ed6c files/build.xml-3.2.0_rc2.bz2 7971
+SHA256 5a227829ae936ebf216c3343f512d05197d03abfaa4cb89e2d7f0577a434223d files/build.xml-3.2.0_rc2.bz2 7971
 AUX conf.d/wildfire 491 RMD160 a11202a762cffb01a0d33a69ab65283a5962cfce SHA1 4a41b03dc09f4aa375a0c793a53ff10129cf5432 SHA256 c1b3ba0a0da4854118e4e8debd370d8e2deb7f08a3fe5c4b5c4bedae5428498b
 MD5 3ea87a69285ce987e501c835629b0af3 files/conf.d/wildfire 491
 RMD160 a11202a762cffb01a0d33a69ab65283a5962cfce files/conf.d/wildfire 491
@@ -19,6 +23,7 @@ RMD160 afaa6d826bd732b4195e13d5eb606df3dc976704 files/init.d/wildfire 571
 SHA256 2bc37ba293e67806a83600b46eec26625f6830fd4f0f4677c3b5636be2090c42 files/init.d/wildfire 571
 DIST wildfire_src_3_1_0.tar.gz 17263810 RMD160 0643ae65b761f33ebb3fb5492f13f5d82fadd35d SHA1 e491f51c2270afb9c9924d404f11ff74318bd29f SHA256 aef071a915a127dac1d3b6f488c246e55d0be9233d53caecf79662368c757ee6
 DIST wildfire_src_3_1_1.tar.gz 13963780 RMD160 6f215f19eee92151c03b1d1c5fe0020be416a982 SHA1 9aa2a47292a1894cd2c8fa2b997e80b5eb507108 SHA256 cbe0e162e1e483adafae65ca01f42ef9a402041f6d6e90e419c0688488b7c831
+DIST wildfire_src_3_2_0_rc2.tar.gz 15272793 RMD160 6005e860d836ec7ff9b1202130b6468e95495eb8 SHA256 688bf3605b26493f27683fcf253efae29417143ffeb9cfb4578bf971761fa4fe
 EBUILD wildfire-3.1.0.ebuild 2527 RMD160 04e4105b52c03d267b21cd84dccab52a9feec05b SHA1 da49e05ddec814449764c565f1bac8c0a9ad8978 SHA256 aed11d0a8a41b6136cb083b5cd8d7810f4b88dfdde572db7f741701db2db19fc
 MD5 ecf90e26796c248cb7e27107d67471a8 wildfire-3.1.0.ebuild 2527
 RMD160 04e4105b52c03d267b21cd84dccab52a9feec05b wildfire-3.1.0.ebuild 2527
@@ -27,10 +32,14 @@ EBUILD wildfire-3.1.1.ebuild 2586 RMD160 b2393562b6dce34350770010610ed9880302ef6
 MD5 e53d7d31af7f9b8c1ba8597f73e4608a wildfire-3.1.1.ebuild 2586
 RMD160 b2393562b6dce34350770010610ed9880302ef67 wildfire-3.1.1.ebuild 2586
 SHA256 e97d792e2298edc8a5d330079bd968fa40556ec792964a396d53dbc65d666f35 wildfire-3.1.1.ebuild 2586
-MISC ChangeLog 3953 RMD160 c9fde4d3531c750bdc6983132fda2dcd588bb8e1 SHA1 085eee69a599e234e1be72848d26cd11cc68cbba SHA256 f199df651a5da54782c23df5b6c63c4066450b465d860b83466dbeae72da8747
-MD5 3e32f7c8dd5020da83c42b36b8c73f06 ChangeLog 3953
-RMD160 c9fde4d3531c750bdc6983132fda2dcd588bb8e1 ChangeLog 3953
-SHA256 f199df651a5da54782c23df5b6c63c4066450b465d860b83466dbeae72da8747 ChangeLog 3953
+EBUILD wildfire-3.2.0_rc2.ebuild 2591 RMD160 bf5a411bc7020cd7d2483ee51dab082a9d0417d5 SHA1 4a87f7b75ebbc8b7eeccfd00e47cbfc9f8b94c68 SHA256 b96c0f03317addfee84165d80132224b012c5007af6b4ffbbbad9067fbf55d9b
+MD5 b7e2c54cd2f576f46193e2ef8ec8f588 wildfire-3.2.0_rc2.ebuild 2591
+RMD160 bf5a411bc7020cd7d2483ee51dab082a9d0417d5 wildfire-3.2.0_rc2.ebuild 2591
+SHA256 b96c0f03317addfee84165d80132224b012c5007af6b4ffbbbad9067fbf55d9b wildfire-3.2.0_rc2.ebuild 2591
+MISC ChangeLog 4172 RMD160 814f0b28df913aad546fff581f9f82dfc59cb687 SHA1 9c2704e9cd5468d9b713a4caf66f0cfa760d4522 SHA256 54768631a290121cd7167b1cfeeb218159f3bffcd043142a2350d51c941e5205
+MD5 f10c03fedf6c72c2a84daa39aff99f6b ChangeLog 4172
+RMD160 814f0b28df913aad546fff581f9f82dfc59cb687 ChangeLog 4172
+SHA256 54768631a290121cd7167b1cfeeb218159f3bffcd043142a2350d51c941e5205 ChangeLog 4172
 MISC metadata.xml 481 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 SHA1 feaf705fb8276479cc0f6cca72813eb60b3943a3 SHA256 9965da5e7c0ff80e17e7d673bb35544147e0049ddac59e8f8ba1b1d83971b9e5
 MD5 99126bebaaa8a8b18d1e1ace23623a2b metadata.xml 481
 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 metadata.xml 481
@@ -41,10 +50,13 @@ SHA256 6ef8f2b0ee3f1bd9b296bcdc739faf87c7be31495c6175f68cb2da14b57b2f8b files/di
 MD5 ad63eaf0e3eaeccae4e02f333f0dbbbf files/digest-wildfire-3.1.1 262
 RMD160 3b5dab78af0f4c80c3d76fe96bec79a0d2656232 files/digest-wildfire-3.1.1 262
 SHA256 07bb7dbe5d63821fdef9685c9831e5e7361f314b34e95874fcbf982df8544b12 files/digest-wildfire-3.1.1 262
+MD5 e9b07ada9605dbc065f04ef8cc567bd8 files/digest-wildfire-3.2.0_rc2 274
+RMD160 8b4ec81463439bfa213d5e2289e563904ad236ae files/digest-wildfire-3.2.0_rc2 274
+SHA256 b17922032294a4bf72e484499a0795a521c425effe355736f4a463e38c5f4205 files/digest-wildfire-3.2.0_rc2 274
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFx79Z8zY1VwezZiERAoeXAJ4mELVOKAD7vOuFzc41SzUOHLqm1wCfSHv1
-KuBxkVwn1w+BkJD55hKtrdk=
-=l7rw
+iD8DBQFFx8wQ8zY1VwezZiERAkHAAJ0YFx2W0YPxH5Czb9WH6JjBwXETewCgozbR
+MTAmbz90oWtXrt4LKzoB1uI=
+=ipa+
 -----END PGP SIGNATURE-----

diff --git a/net-im/wildfire/files/build.xml-3.2.0_rc2.bz2 b/net-im/wildfire/files/build.xml-3.2.0_rc2.bz2
new file mode 100644 (file)
index 0000000..c66e443
Binary files /dev/null and b/net-im/wildfire/files/build.xml-3.2.0_rc2.bz2 differ

diff --git a/net-im/wildfire/files/digest-wildfire-3.2.0_rc2 b/net-im/wildfire/files/digest-wildfire-3.2.0_rc2
new file mode 100644 (file)
index 0000000..d56dae9
--- /dev/null
+++ b/net-im/wildfire/files/digest-wildfire-3.2.0_rc2
@@ -0,0 +1,3 @@
+MD5 3b6a7f8c93ce19bf82b0bd49471222e6 wildfire_src_3_2_0_rc2.tar.gz 15272793
+RMD160 6005e860d836ec7ff9b1202130b6468e95495eb8 wildfire_src_3_2_0_rc2.tar.gz 15272793
+SHA256 688bf3605b26493f27683fcf253efae29417143ffeb9cfb4578bf971761fa4fe wildfire_src_3_2_0_rc2.tar.gz 15272793

diff --git a/net-im/wildfire/wildfire-3.2.0_rc2.ebuild b/net-im/wildfire/wildfire-3.2.0_rc2.ebuild
new file mode 100644 (file)
index 0000000..9fa1f3d
--- /dev/null
+++ b/net-im/wildfire/wildfire-3.2.0_rc2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/wildfire-3.2.0_rc2.ebuild,v 1.1 2007/02/06 00:29:56 humpback Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Wildfire Jabber server"
+HOMEPAGE="http://jivesoftware.org/messenger/"
+SRC_URI="http://www.jivesoftware.org/builds/wildfire/${PN//-/_}_src_${PV//./_}.tar.gz"
+RESTRICT=""
+LICENSE="GPL-2"
+
+SLOT="0"
+
+KEYWORDS="~x86 ~amd64"
+IUSE="doc"
+
+# For transports
+PROVIDE="virtual/jabber-server"
+
+RDEPEND=" >=virtual/jre-1.5 "
+# Doesn't build against Java 1.6 due to changes in JDBC API
+DEPEND="net-im/jabber-base
+               =virtual/jdk-1.5*
+               >=dev-java/ant-1.6
+               dev-java/ant-contrib
+               >=dev-java/commons-net-1.4"
+
+S=${WORKDIR}/${PN//-/_}_src
+
+pkg_setup() {
+       if [ -f /etc/env.d/98wildfire ]; then
+               einfo "This is an upgrade"
+       else
+               ewarn "If this is an upgrade stop right ( CONTROL-C ) and run the command:"
+               ewarn "echo 'CONFIG_PROTECT=\"/opt/wildfire/resources/security/\"' > /etc/env.d/98wildfire "
+               ewarn "For more info see bug #139708"
+               sleep 11
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       cp ${FILESDIR}/build.xml-${PV}.bz2 .
+       bunzip2 build.xml-${PV}.bz2
+       mv build.xml-${PV} build/build.xml
+       # TODO should replace jars in build/lib with ones packaged by us -nichoj
+}
+
+src_compile() {
+       # Jikes doesn't support -source 1.5
+       java-pkg_filter-compiler jikes
+
+       eant -f build/build.xml wildfire plugins plugins-dev $(use_doc)
+}
+
+src_install() {
+       dodir /opt/wildfire
+       
+       doinitd ${FILESDIR}/init.d/wildfire
+       doconfd ${FILESDIR}/conf.d/wildfire
+
+       dodir /opt/wildfire/conf
+       insinto /opt/wildfire/conf
+       newins target/wildfire/conf/wildfire.xml wildfire.xml.sample
+
+       dodir /opt/wildfire/logs
+       keepdir /opt/wildfire/logs
+
+       dodir /opt/wildfire/lib
+       insinto /opt/wildfire/lib
+       doins target/wildfire/lib/*
+
+       dodir /opt/wildfire/plugins
+       insinto /opt/wildfire/plugins
+       doins -r target/wildfire/plugins/*
+
+       dodir /opt/wildfire/resources
+       insinto /opt/wildfire/resources
+       doins -r target/wildfire/resources/*
+
+       if use doc; then
+               dohtml -r documentation/docs/*
+       fi
+       dodoc documentation/dist/*
+
+       #Protect ssl key on upgrade
+       dodir /etc/env.d/
+       echo 'CONFIG_PROTECT="/opt/wildfire/resources/security/"' > ${D}/etc/env.d/98wildfire
+}
+
+pkg_postinst() {
+       chown -R jabber:jabber /opt/wildfire
+
+       ewarn If this is a new install, please edit /opt/wildfire/conf/wildfire.xml.sample
+       ewarn and save it as /opt/wildfire/conf/wildfire.xml
+       einfo
+       ewarn The following must be be owned or writable by the jabber user.
+       einfo /opt/wildfire/conf/wildfire.xml
+}