update to gen2 vm

(Portage version: 2.1.1_pre2-r1)
 (Signed Manifest commit)

5 files changed, 14 insertions, 192 deletions

diff --git a/net-im/wildfire/Manifest b/net-im/wildfire/Manifest
index 6d42bf427f2d..57c55cb5fc32 100644
--- a/net-im/wildfire/Manifest
+++ b/net-im/wildfire/Manifest
@@ -9,34 +9,26 @@ AUX init.d/wildfire 725 RMD160 9ba294aa94e189cb9e3662f535142a5259bfa014 SHA1 5ad
 MD5 e9cb458e29a1f36a5c5ad48ee271e1cf files/init.d/wildfire 725
 RMD160 9ba294aa94e189cb9e3662f535142a5259bfa014 files/init.d/wildfire 725
 SHA256 1862b98d46c5d0e9a3d006ae734f70ac4ce4e4f156bba2d84535c73ed9ca0974 files/init.d/wildfire 725
-DIST wildfire_src_2_5_0.tar.gz 10973825 RMD160 01259bb136bcd59db08802d02687be5a86d99c0d SHA256 78236b3554240880f5ebaf3e20dfb2d7b2e4a3096a6de3e909c025f15428c102
 DIST wildfire_src_2_6_2.tar.gz 11621818 RMD160 7cd86f5442f3fc4a01e1fdef8003b9e113804631 SHA1 f73c08df6a336ff803135bd166a5418839ad50f9 SHA256 9e8ff13c37934b56aee7f0471af4faa4a09e998cfec5f18a463d6282580fa1d0
-EBUILD wildfire-2.5.0.ebuild 1944 RMD160 2afda46b07d1dcf12c67e57f409359e63ceb1ebd SHA1 8579829966b61c8def32412c05eb3d5df581c14c SHA256 dd7887b47a9acf7f864e4556985790b5c7088d938da33bee4d76db2663d57b74
-MD5 24ec9ec30cbca1c10010c6894a7c14d9 wildfire-2.5.0.ebuild 1944
-RMD160 2afda46b07d1dcf12c67e57f409359e63ceb1ebd wildfire-2.5.0.ebuild 1944
-SHA256 dd7887b47a9acf7f864e4556985790b5c7088d938da33bee4d76db2663d57b74 wildfire-2.5.0.ebuild 1944
-EBUILD wildfire-2.6.2.ebuild 1977 RMD160 6d2d2c9bbbfd4130c0c15e0b7cccb190eecddcc8 SHA1 b4778819288ccb438e5f909b7d7106c49c996dba SHA256 28dbf93e53446b87373d5dfe51e41b391427abddd901ef8b85692904f9be1086
-MD5 0efae828f85bb179ce9dc058fa89168c wildfire-2.6.2.ebuild 1977
-RMD160 6d2d2c9bbbfd4130c0c15e0b7cccb190eecddcc8 wildfire-2.6.2.ebuild 1977
-SHA256 28dbf93e53446b87373d5dfe51e41b391427abddd901ef8b85692904f9be1086 wildfire-2.6.2.ebuild 1977
-MISC ChangeLog 791 RMD160 8cdf7b1c1ec25b0285d5bf3419869f0ca2ec03f1 SHA1 20253c81cbd240f448a6b51dd311e8750919c1a0 SHA256 8362dd6ce2d338761eeb9a65bedae6dc4ab91b03d4e52c8668cd3226e3957cc4
-MD5 fc84c4c3e5fa28b717668e6b7c4b63da ChangeLog 791
-RMD160 8cdf7b1c1ec25b0285d5bf3419869f0ca2ec03f1 ChangeLog 791
-SHA256 8362dd6ce2d338761eeb9a65bedae6dc4ab91b03d4e52c8668cd3226e3957cc4 ChangeLog 791
+EBUILD wildfire-2.6.2-r1.ebuild 2199 RMD160 181833e94eb6717fb7a60aa6d01487e857015396 SHA1 0c0e917fc6525610288c3d16c78b974c1a900439 SHA256 852bb90343cedca8f91b6078272fa76cd55091f6cf3968b1afbbd206cd24576d
+MD5 0139855ff5ab418196fa2e9d5aa44764 wildfire-2.6.2-r1.ebuild 2199
+RMD160 181833e94eb6717fb7a60aa6d01487e857015396 wildfire-2.6.2-r1.ebuild 2199
+SHA256 852bb90343cedca8f91b6078272fa76cd55091f6cf3968b1afbbd206cd24576d wildfire-2.6.2-r1.ebuild 2199
+MISC ChangeLog 1113 RMD160 104440ac16d65873b750957f67c3503200e8cb85 SHA1 458ea405c08547775b0d73a2089f06d0571deea3 SHA256 417043585295b86322efa87692c6d37b76de1e9088f8dd028b8448fd4878e898
+MD5 8b2ce2319934ba6fc7e7348a3995c9c2 ChangeLog 1113
+RMD160 104440ac16d65873b750957f67c3503200e8cb85 ChangeLog 1113
+SHA256 417043585295b86322efa87692c6d37b76de1e9088f8dd028b8448fd4878e898 ChangeLog 1113
 MISC metadata.xml 481 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 SHA1 feaf705fb8276479cc0f6cca72813eb60b3943a3 SHA256 9965da5e7c0ff80e17e7d673bb35544147e0049ddac59e8f8ba1b1d83971b9e5
 MD5 99126bebaaa8a8b18d1e1ace23623a2b metadata.xml 481
 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 metadata.xml 481
 SHA256 9965da5e7c0ff80e17e7d673bb35544147e0049ddac59e8f8ba1b1d83971b9e5 metadata.xml 481
-MD5 ca6364b9aa1d54d0213edbd18cfe29b3 files/digest-wildfire-2.5.0 262
-RMD160 97656f9a34a984477c222fa1ce02fa7d7d76eaff files/digest-wildfire-2.5.0 262
-SHA256 c03d1071ac93dbf19ed0d9d26951560b9089932494d52cb7a7522b4021336149 files/digest-wildfire-2.5.0 262
-MD5 d0164b0e043a73e2ae569278afe40e80 files/digest-wildfire-2.6.2 262
-RMD160 8a07aecd7abbef7b956bcda940eedeb309e0ca85 files/digest-wildfire-2.6.2 262
-SHA256 eefee1c30250b2f3c78e18df5601cadc8a6055b775b25b3d47ac62bab2c308a6 files/digest-wildfire-2.6.2 262
+MD5 d0164b0e043a73e2ae569278afe40e80 files/digest-wildfire-2.6.2-r1 262
+RMD160 8a07aecd7abbef7b956bcda940eedeb309e0ca85 files/digest-wildfire-2.6.2-r1 262
+SHA256 eefee1c30250b2f3c78e18df5601cadc8a6055b775b25b3d47ac62bab2c308a6 files/digest-wildfire-2.6.2-r1 262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEpbtn8zY1VwezZiERAtfYAJwNBx+SGtBRXZJqsJnJ23rSR03tAQCfeXOC
-413FXv4rZe2vsPTgD4fmUQ4=
-=eqtf
+iD8DBQFEqc8d8zY1VwezZiERApYaAJsEtWCSv8C8C6j160UIiSG0dAo+6gCfQ1zG
+37EiN0XxWCK0RE3bUvasX2Y=
+=817B
 -----END PGP SIGNATURE-----
diff --git a/net-im/wildfire/files/digest-wildfire-2.5.0 b/net-im/wildfire/files/digest-wildfire-2.5.0
deleted file mode 100644
index 8dce1a3193cd..000000000000
--- a/net-im/wildfire/files/digest-wildfire-2.5.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2c56c9f96f61bc6584c1b64cf6cb34d8 wildfire_src_2_5_0.tar.gz 10973825
-RMD160 01259bb136bcd59db08802d02687be5a86d99c0d wildfire_src_2_5_0.tar.gz 10973825
-SHA256 78236b3554240880f5ebaf3e20dfb2d7b2e4a3096a6de3e909c025f15428c102 wildfire_src_2_5_0.tar.gz 10973825
diff --git a/net-im/wildfire/files/digest-wildfire-2.6.2 b/net-im/wildfire/files/digest-wildfire-2.6.2
deleted file mode 100644
index 1b33c47d7840..000000000000
--- a/net-im/wildfire/files/digest-wildfire-2.6.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 01f54bc8cb8403b15c4b39c4d951cff6 wildfire_src_2_6_2.tar.gz 11621818
-RMD160 7cd86f5442f3fc4a01e1fdef8003b9e113804631 wildfire_src_2_6_2.tar.gz 11621818
-SHA256 9e8ff13c37934b56aee7f0471af4faa4a09e998cfec5f18a463d6282580fa1d0 wildfire_src_2_6_2.tar.gz 11621818
diff --git a/net-im/wildfire/wildfire-2.5.0.ebuild b/net-im/wildfire/wildfire-2.5.0.ebuild
deleted file mode 100644
index afdb11e179af..000000000000
--- a/net-im/wildfire/wildfire-2.5.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/wildfire-2.5.0.ebuild,v 1.1 2006/02/26 13:36:31 humpback Exp $
-
-inherit java-utils
-
-DESCRIPTION="Wildfire Jabber server"
-HOMEPAGE="http://jivesoftware.org/messenger/"
-SRC_URI="http://www.jivesoftware.org/servlet/download/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 >=virtual/jdk-1.5 )"
-DEPEND="net-im/jabber-base
->=virtual/jdk-1.5 dev-java/ant"
-
-S=${WORKDIR}/${PN//-/_}_src
-
-
-src_compile() {
-	java-utils_vm-version-sufficient
-	ant -f build/build.xml || die
-	ant -f build/build.xml jar || die
-
-	einfo
-	einfo "Building plugins..."
-	einfo
-	ant -f build/build.xml plugins || die
-}
-
-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/conf/wildfire.xml wildfire.xml.sample
-
-	dodir /opt/wildfire/logs
-	keepdir /opt/wildfire/logs
-
-	dodir /opt/wildfire/lib
-	insinto /opt/wildfire/lib
-	doins target/lib/*
-
-	dodir /opt/wildfire/plugins
-	insinto /opt/wildfire/plugins
-	doins -r target/plugins/*
-
-	dodir /opt/wildfire/resources
-	insinto /opt/wildfire/resources
-	doins -r target/resources/*
-
-	if use doc; then
-		dohtml -r documentation/docs/*
-	fi
-	dodoc documentation/dist/*
-
-	#Protect ssl key on upgrade
-	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
-}
diff --git a/net-im/wildfire/wildfire-2.6.2.ebuild b/net-im/wildfire/wildfire-2.6.2.ebuild
deleted file mode 100644
index 4074ff78a020..000000000000
--- a/net-im/wildfire/wildfire-2.6.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/wildfire/wildfire-2.6.2.ebuild,v 1.1 2006/06/30 23:59:46 humpback Exp $
-
-inherit java-utils
-
-DESCRIPTION="Wildfire Jabber server"
-HOMEPAGE="http://jivesoftware.org/messenger/"
-SRC_URI="http://www.jivesoftware.org/servlet/download/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 >=virtual/jdk-1.5 )"
-DEPEND="net-im/jabber-base
-		>=virtual/jdk-1.5
-		dev-java/ant
-		>=dev-java/commons-net-1.4"
-
-S=${WORKDIR}/${PN//-/_}_src
-
-
-src_compile() {
-	java-utils_vm-version-sufficient
-	ant -f build/build.xml || die
-	ant -f build/build.xml jar || die
-
-	einfo
-	einfo "Building plugins..."
-	einfo
-	ant -f build/build.xml plugins || die
-}
-
-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/conf/wildfire.xml wildfire.xml.sample
-
-	dodir /opt/wildfire/logs
-	keepdir /opt/wildfire/logs
-
-	dodir /opt/wildfire/lib
-	insinto /opt/wildfire/lib
-	doins target/lib/*
-
-	dodir /opt/wildfire/plugins
-	insinto /opt/wildfire/plugins
-	doins -r target/plugins/*
-
-	dodir /opt/wildfire/resources
-	insinto /opt/wildfire/resources
-	doins -r target/resources/*
-
-	if use doc; then
-		dohtml -r documentation/docs/*
-	fi
-	dodoc documentation/dist/*
-
-	#Protect ssl key on upgrade
-	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
-}