fix 139708

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

3 files changed, 25 insertions, 105 deletions

diff --git a/net-im/wildfire/Manifest b/net-im/wildfire/Manifest
index 72a59bc52f89..86a4b42050cf 100644
--- a/net-im/wildfire/Manifest
+++ b/net-im/wildfire/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
@@ -12,18 +15,18 @@ RMD160 7d80ea715a68e9e899fd09a92336cfd83be014e9 files/wildfire-3.0.0-for.patch 1
 SHA256 41c374944396ca83bfea30cafcaf0509951c96d9ddb56b973ce326d2abe419a8 files/wildfire-3.0.0-for.patch 1385
 DIST wildfire_src_2_6_2.tar.gz 11621818 RMD160 7cd86f5442f3fc4a01e1fdef8003b9e113804631 SHA1 f73c08df6a336ff803135bd166a5418839ad50f9 SHA256 9e8ff13c37934b56aee7f0471af4faa4a09e998cfec5f18a463d6282580fa1d0
 DIST wildfire_src_3_0_0.tar.gz 15861124 RMD160 4a94369be80e463cf3ababb6b3cb9313607e3ee2 SHA1 a9e1357d557d777f08cc517e4368369ca903745c SHA256 86ceba2e13979cb44ca9c508ac2cd08b1dc7d46c63b5fdf57ca06281c11cf5b6
-EBUILD wildfire-2.6.2-r2.ebuild 2199 RMD160 d60d97e17b40ba1d5c473cebb5f307bcabb0bd60 SHA1 bc10dd6b563953892ba6f842492db654987a9742 SHA256 9b658313025e749777d1f253ebbc8a59403cdba5d2b720b664a4c34bf2cb0fc2
-MD5 6cb4e23be8e9dab063a89a90d79f5ba9 wildfire-2.6.2-r2.ebuild 2199
-RMD160 d60d97e17b40ba1d5c473cebb5f307bcabb0bd60 wildfire-2.6.2-r2.ebuild 2199
-SHA256 9b658313025e749777d1f253ebbc8a59403cdba5d2b720b664a4c34bf2cb0fc2 wildfire-2.6.2-r2.ebuild 2199
-EBUILD wildfire-3.0.0.ebuild 2140 RMD160 9e6965a429644fbd35fed11b1668ceabb932c6d1 SHA1 2c1a369c888b6c8a0940bb1457d0fa614ce37d78 SHA256 1ddb3f4b7de0218bec5608b6ab9bd727052e0fffe025c5dddd670e4a89a67370
-MD5 bf09a6ccdf51f3fcc26c47863864a902 wildfire-3.0.0.ebuild 2140
-RMD160 9e6965a429644fbd35fed11b1668ceabb932c6d1 wildfire-3.0.0.ebuild 2140
-SHA256 1ddb3f4b7de0218bec5608b6ab9bd727052e0fffe025c5dddd670e4a89a67370 wildfire-3.0.0.ebuild 2140
-MISC ChangeLog 1930 RMD160 7d43edd7b12521b7ddd6bbdc2ff1d3a4df4f2ce2 SHA1 8f7a812d5e565d147515d44dad46743f955bf9b9 SHA256 0bbd258ad2815f6c02922a525a86291bd374cb7fd043adf657a6928129a92be5
-MD5 608b0afc66f7743b0b7448e20abcde82 ChangeLog 1930
-RMD160 7d43edd7b12521b7ddd6bbdc2ff1d3a4df4f2ce2 ChangeLog 1930
-SHA256 0bbd258ad2815f6c02922a525a86291bd374cb7fd043adf657a6928129a92be5 ChangeLog 1930
+EBUILD wildfire-2.6.2-r2.ebuild 2218 RMD160 b0e79aaf493ec8a17b6554f5b32475cbcb725ac8 SHA1 201180130268d69fecc5a3bee7b042bf8b8dc3fb SHA256 c3f9755d91099c3562283675486c2a089d230b8b04cabfeec0296f86488831be
+MD5 773bf9674b7cef784626adb3e6a199ab wildfire-2.6.2-r2.ebuild 2218
+RMD160 b0e79aaf493ec8a17b6554f5b32475cbcb725ac8 wildfire-2.6.2-r2.ebuild 2218
+SHA256 c3f9755d91099c3562283675486c2a089d230b8b04cabfeec0296f86488831be wildfire-2.6.2-r2.ebuild 2218
+EBUILD wildfire-3.0.0-r1.ebuild 2483 RMD160 d2df99a118a55d0812460e2672008711c721e8e4 SHA1 ed8c2a971067885df65551cd771ec634bd0c52a0 SHA256 a302bb5e395187c63d885b3ca7f514d71912b7026c94b061dd79b5dffeb4b808
+MD5 02bb9afd019932cda530936d2dc4d40c wildfire-3.0.0-r1.ebuild 2483
+RMD160 d2df99a118a55d0812460e2672008711c721e8e4 wildfire-3.0.0-r1.ebuild 2483
+SHA256 a302bb5e395187c63d885b3ca7f514d71912b7026c94b061dd79b5dffeb4b808 wildfire-3.0.0-r1.ebuild 2483
+MISC ChangeLog 2185 RMD160 aa06d304d8e281375fffedfd66c326e672ebc39d SHA1 61d503a0425ca73738082d05528ad5b3925d1506 SHA256 d9c6f33fdb8cc8a2bce988b2b7c85f32079e494dde3e941eef0a8c96ed19759c
+MD5 98c162707c5836ff447cf89ece88b038 ChangeLog 2185
+RMD160 aa06d304d8e281375fffedfd66c326e672ebc39d ChangeLog 2185
+SHA256 d9c6f33fdb8cc8a2bce988b2b7c85f32079e494dde3e941eef0a8c96ed19759c ChangeLog 2185
 MISC metadata.xml 481 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 SHA1 feaf705fb8276479cc0f6cca72813eb60b3943a3 SHA256 9965da5e7c0ff80e17e7d673bb35544147e0049ddac59e8f8ba1b1d83971b9e5
 MD5 99126bebaaa8a8b18d1e1ace23623a2b metadata.xml 481
 RMD160 fdf92e519d0ea6ea0e0ac6d725a6212c693c35d4 metadata.xml 481
@@ -31,6 +34,13 @@ SHA256 9965da5e7c0ff80e17e7d673bb35544147e0049ddac59e8f8ba1b1d83971b9e5 metadata
 MD5 d0164b0e043a73e2ae569278afe40e80 files/digest-wildfire-2.6.2-r2 262
 RMD160 8a07aecd7abbef7b956bcda940eedeb309e0ca85 files/digest-wildfire-2.6.2-r2 262
 SHA256 eefee1c30250b2f3c78e18df5601cadc8a6055b775b25b3d47ac62bab2c308a6 files/digest-wildfire-2.6.2-r2 262
-MD5 2adcb06b4d12713f190a58355997e791 files/digest-wildfire-3.0.0 262
-RMD160 9fae97d3a894b60d56a6da0636e5524e527a7a88 files/digest-wildfire-3.0.0 262
-SHA256 55b90002daef0a1f334c821944810e63635e08fcc2cba98900e16f75de9cbb9a files/digest-wildfire-3.0.0 262
+MD5 2adcb06b4d12713f190a58355997e791 files/digest-wildfire-3.0.0-r1 262
+RMD160 9fae97d3a894b60d56a6da0636e5524e527a7a88 files/digest-wildfire-3.0.0-r1 262
+SHA256 55b90002daef0a1f334c821944810e63635e08fcc2cba98900e16f75de9cbb9a files/digest-wildfire-3.0.0-r1 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEsRt88zY1VwezZiERAr3HAJ9cqgl0CAzbfH0BGm7sWG4KRTdFxACfQv/i
+wx+z3MJo5rYQUugsKz7t3oU=
+=PKVk
+-----END PGP SIGNATURE-----
diff --git a/net-im/wildfire/files/digest-wildfire-3.0.0 b/net-im/wildfire/files/digest-wildfire-3.0.0
deleted file mode 100644
index 13e7bb68b7cc..000000000000
--- a/net-im/wildfire/files/digest-wildfire-3.0.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6ca689c8768eb4b1ba2436bb998b4446 wildfire_src_3_0_0.tar.gz 15861124
-RMD160 4a94369be80e463cf3ababb6b3cb9313607e3ee2 wildfire_src_3_0_0.tar.gz 15861124
-SHA256 86ceba2e13979cb44ca9c508ac2cd08b1dc7d46c63b5fdf57ca06281c11cf5b6 wildfire_src_3_0_0.tar.gz 15861124
diff --git a/net-im/wildfire/wildfire-3.0.0.ebuild b/net-im/wildfire/wildfire-3.0.0.ebuild
deleted file mode 100644
index 881cf7b9eaf9..000000000000
--- a/net-im/wildfire/wildfire-3.0.0.ebuild
+++ /dev/null
@@ -1,87 +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-3.0.0.ebuild,v 1.3 2006/07/06 17:44:59 nichoj Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-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 "
-# 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
-		dev-java/ant-contrib
-		>=dev-java/commons-net-1.4"
-
-S=${WORKDIR}/${PN//-/_}_src
-
-ant_src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-for.patch
-	# 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 jar plugins $(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/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
-}