Version bump (bug #456880). Remove old.

Package-Manager: portage-2.2.0_alpha162/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463

10 files changed, 69 insertions, 476 deletions

diff --git a/net-p2p/vuze-coreplugins/ChangeLog b/net-p2p/vuze-coreplugins/ChangeLog
index 766de9adf4f2..4bf1532b8d4c 100644
--- a/net-p2p/vuze-coreplugins/ChangeLog
+++ b/net-p2p/vuze-coreplugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/vuze-coreplugins
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze-coreplugins/ChangeLog,v 1.40 2012/08/21 00:35:00 dirtyepic Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze-coreplugins/ChangeLog,v 1.41 2013/02/14 04:42:55 dirtyepic Exp $
+
+*vuze-coreplugins-4.8.1.2 (14 Feb 2013)
+
+  14 Feb 2013; Ryan Hill <dirtyepic@gentoo.org>
+  -vuze-coreplugins-4.6.0.2.ebuild, -vuze-coreplugins-4.7.0.0.ebuild,
+  -vuze-coreplugins-4.7.0.2.ebuild, +vuze-coreplugins-4.8.1.2.ebuild:
+  Version bump (bug #456880). Remove old.
 
 *vuze-coreplugins-4.7.1.2 (21 Aug 2012)
 
diff --git a/net-p2p/vuze-coreplugins/Manifest b/net-p2p/vuze-coreplugins/Manifest
index ce4533b1c0d0..4152bbfe5661 100644
--- a/net-p2p/vuze-coreplugins/Manifest
+++ b/net-p2p/vuze-coreplugins/Manifest
@@ -2,24 +2,25 @@
 Hash: SHA256
 
 DIST azplugins_2.1.6.jar 309944 SHA256 81ed58fba9d70916360bc7e13341dbb7afaef25878fa493c4fed5a2ba18d170a SHA512 36c6bbe5a3874071e944ffca59fd10a6eaa812b1db4d268f2d8b428295f6b61cfec1c0c09f01c0bfe6f4dbdfd569602d1cc0fb1f93120309dc00a0de83455fa6 WHIRLPOOL f9c258dfc29a9f392d0ead93c3918db941f22c872447d7a6ad79a0fada47277454057d5732c58bfa772d0ae37670fa322b90fb3bed2f530b09aa6363296fb6c9
+DIST azplugins_2.1.7.jar 318260 SHA256 8ddba56bcb271319c610bd25b0a9beba4a28adb2ba7888b099573970a1c13368 SHA512 e439371e386c515f728813189644ab99f5f2404f03877c2e7d83bc2b5ef3b5dbaba8fc8a15ce84a786b7fca3a370447c81d00905ed8c304df1d1c21b0e0aaa4f WHIRLPOOL 72ba47abf46cf1ad8bbe9279289cb59a96a913c9003fd103ad14b43f4aff7d0fde7c01f3207a4fa971b05ff5601cc9563f87707e35fcda18d95cfcfc8c906eac
 DIST azrating_1.3.1.jar 38172 SHA256 8eedb5c7d731fc1f4bc86b2c7b5df386ed16b9d17a6705eaa2da2ead67546863 SHA512 8a9916b2736b577d29e82be95eddd0b79814f275b52602495c96dbabaff8128b5697d08a30914b714c26f9f738854822994e70c90a92c97bc9381bd1899b38cc WHIRLPOOL 6a97f9158013a89c278f14bafc30d505f9ac2b63bc7b9c0404ff9dc782eb65d79147cf10f007d62f9df0cfe4634f6c959406f814bb5ad35651b84b4977fbf5c1
 DIST azupdater_1.8.17.zip 26023 SHA256 7c5cd591f3f606023aac25c284c57a40b8eb183ccb270b897f7a646c7588bc58 SHA512 21806270d45afe393ace0b5bffb5e6800a45aecb40cc32bef0f2953182a410f0369084a30897bdb4d68beef176f9b59a209fd54df306c68e9b492c8d3d73cb06 WHIRLPOOL d9a798b3255f0f5e19d59119977868171e979a62e16b67da481aa030829f60d231e141dd096a8bc04eebec981ab0ee0197c247496121b814fd4cd96740ae5ba8
 DIST azupnpav_0.2.30.zip 210838 SHA256 b5fd5703aa76903ff31d66017875fb824d2493d1111a347ee670464c0b1ec692
-DIST azupnpav_0.3.6.zip 243059 SHA256 6b67d3c83931fba7980a993ce18bae64ce4fae815c44ea1375684ad6506ea621
-DIST azupnpav_0.3.8.zip 244297 SHA256 d1d388707792e23f264baf245af0c7549dffae382fdaba0f1f69da5511d7aee9 SHA512 e12b71ab05c412fcf1307aeffb927717e8fdc31d7c5093c447743c4a9d1c250836466f367d4289432b4da817756b4e25e8c1a1f06f5e757c3c3e4756a2690bd9 WHIRLPOOL 248fd8029df1741d961339c09d6eb746f18e6e94047a636f06ee613c9cfc07c75b427d860afc9b7e78537fab04673aebe183ea00a267c58deae53afa3cce510c
-DIST azupnpav_0.3.9.zip 244453 SHA256 d4c050402af7d53527c92e0793eab5066a1c8ed94df64b01c2950dda32c2b9df SHA512 1935f8b73550b15cf648d9555880c06a612587fbac44261ea6aacff19e9fa9c7593b4c72bfd9a7adddc4e27ba71ce8e4cf8901dcae73e2c2fc2b6c3a527e60a2 WHIRLPOOL 0ceb7bb4c83500c86285edeaf0e0c7583ad3e581ee2214c4feeb1ab8d1b03ddef2244a2892b23d4e38655a990ff60ccbc042865b2e10f01d3339746a5d2e7c91
 DIST azupnpav_0.4.1.zip 245201 SHA256 9a8d9cd95ba5c8620245f5fcebbc2722881d23b9c748703cdad9df175d5fafa7 SHA512 edeacf635d3b565bf824a6010c33120a22aa56eb83c11ef4bea4b4117f8278959bb691ecfdc1e152e5faab59de65040306119db6365e76dfa52eb90ec834f430 WHIRLPOOL 64ca46b128368954a9ec9e5b05ad5eb8b151dfa489b38547207a88fdbd846d7dde48186558d00601e2a2b49b6e9d95aeb1e393cf5d3d357a2dc2fc7454e22f08
+DIST azupnpav_0.4.6.zip 247837 SHA256 93775a9ed591c92f1c2b3bbfff10f97d5feda8ec06d0615515562b279b04a091 SHA512 eee392cf82aae37b2689ce086fb00727728064552ca31bbf228d3d76407c15f92d30527b979dfc555dbf3a1ead65d991c55d8c517c0f5c93d5a3890b88bfa6b1 WHIRLPOOL ce2af6831e2dfebe30b60faa112208647dfa638fcf06b2035ba27ca8e40da66163ae4ac36e2a7f379aa3e31e1c0a5814b1ae5038f65fdf07ed15013502a51ecf
 EBUILD vuze-coreplugins-4.5.1.0.ebuild 2006 SHA256 5ab1262f84031071ec30f2f6ff73ee0e6af1681b5fc4e9fe39ef998ccd29172a SHA512 ee829096c67a377497db6928f958fbda40f615c51a905fb9ac4e45bba81aed96835b6b79587be20317056c93a02ac52ad887c24cc5884aac000ec15649aa060e WHIRLPOOL a4739edc6524d6c29e22d6be3877e7960b95ed1508b3765bb7656d978eda995a8166a8bbfe43e362260ec7c3d96d2ac4eff8d26aad2c6a254bb13772ec4d4f26
-EBUILD vuze-coreplugins-4.6.0.2.ebuild 2005 SHA256 6559b53d77a53b827b2bbe9bc488b8e709660f6f38a149f34730e0f09606d2db SHA512 28c22b98d2169bbe47c743dedb5c8c3c6bb7745f33b1e7bd910c2176f470fb2b6d97240ad51f1145c8e2e18ea4f84d10f005f2cd6023f56eb2d003c9cceb9b6d WHIRLPOOL 12c036ec56df5071894afe101e169f67850881add810e2b1a646d6f282b8c01cf83e589dca20201d6ffab8b0284a1193f9920cdcea542c728b052a5bf435d3d4
-EBUILD vuze-coreplugins-4.7.0.0.ebuild 2005 SHA256 e6be0c41a6228b42bc07921d8cc4ce6e27681a98714661eccb1d10d970ed58d7 SHA512 a14ee269dba8f660f4eae517c7ecb1d3a50ad0e8f729b3c8bfcd211f351950599a492b12bae13b57573b034c0214566008a77a5c8819fa2d9cecfc0799af6857 WHIRLPOOL 10e87082c6d6a7c71b5477b75766ca5a3110e789e4c1cf0d29820b98af28a2f64b0b1a0b1e7b8286d527ce2b75687113b44e9d59c4ab1e6151b46fa766e6939c
-EBUILD vuze-coreplugins-4.7.0.2.ebuild 2008 SHA256 7a4cfdb05dcae3ba3819abbe487074f63b33c72321f7df90ab307ac37f6bdb6f SHA512 7c20830c0e7154d68f5d3f87715421878b5cee557efb513f2ad86a981f1a0f05188ab95556a569d6ee59c5b7c28c35efb3555dd8ef2aebb3f93ce57344725a54 WHIRLPOOL 4a93ed94f7c90f0c3627d38bf60d35f1e440accd26a558b8320e95014f260a90cd77b81f9cdbe4b696be000399e6045b1be3ed8b366ddec148819543af2e1862
 EBUILD vuze-coreplugins-4.7.1.2.ebuild 2008 SHA256 058d91bc437430db63d3e4a90ce009138a7ca7bc60dacdabeab2e3d110a624f8 SHA512 5d73067e1ab5703604dd3a223b0ece40776dfd06ab3164ddb30a8bfcaffa9c3b9a5982f173c5543ad607498650b9e0c77ae983c68a5ab2523abbe842de62e721 WHIRLPOOL 356d274034cac419ffe1c2f454dcb49a5e97fadd20f6c4aa8a87ae56b7a6b104945aa6a62a2b2f25485785ac346f55bf87ab6f4691c9597061a1d50b1b8de966
-MISC ChangeLog 6427 SHA256 9655864a3bc6ba3bbddc475be4b2e9e2af229c8630a1539c58acca95f1a37286 SHA512 71e89f060b905bb6bd56efb70b10280c3d2bf3e5a3c31269d7905d095fec2a87003a91506896735295bd7ab5f36230d3729adc7aaff9f51bc7cdecea99361a71 WHIRLPOOL 2fa1795fc4cfe33f283116467428728ed6fab5f45b2ce29b9642adab91897088d92bd4145f9e69eb7dbe12979947ec5ffa48b57f6fe413d33482e29038e357a7
+EBUILD vuze-coreplugins-4.8.1.2.ebuild 2120 SHA256 315df2ba9d4afa98bb3d437ba3b88e9f29e591f6855daeb24fa72208d3c96635 SHA512 6813c5c07c5003909a4b8494e806ee804f2d6b0a235d4185b4de95fb60510faa36855e18ddf40ddac2d59aba71d25cbd1782ceeb7048dd114b55c1a42eb116c4 WHIRLPOOL d43df63656b352c9c97285325e2f36a565de201cc3e7807c15d55cc319207b1a33e7445f921de13223d826e8b04fb3ddbe5e1131c1d815f524e2c4782d9b52bf
+MISC ChangeLog 6699 SHA256 d9835af90d632694dff76f346cfe31fa8b45988cbf7d112fb08c8d280e28f768 SHA512 7b2c09178894c4a4f944d4f31041343a269653bf7e516f07cd08d34fcab44cc382911a9fd39afed6f333a5f4d02cf5ae7f821a1fa868504183a08e0dac258190 WHIRLPOOL 02142aa488126706558ea238f309f582139b069e3007b28f989dd5e70f04dc77dba68fa13fa8f42e2c50154d074f8d581a819dd4eaa1fc1f98dd65e1061a4564
 MISC metadata.xml 250 SHA256 be27a3251cfe700a711e2f9a2cba56b7dfc088c5d1e7ef3874f33348401c845f SHA512 b6556af6ea993229b1d549753e7232b75fa3ea0abc0756c408e6adfe4e834b7f57648a656e1351d3171879ad5e6617dc89f553e19425c818804ef12a1430e5cd WHIRLPOOL 7b8e4ac0e134101d511ae80a6fc70698ce5585ba5b58f3c5242c5a13e1ec9433b7f27b1554517e6099ab984e8f11db3a43a3e47ec22d6ccf8e3772cf6ee6927f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAy2ioACgkQiqiDRvmkBmIbewCgnUlBxjz4cOSxTWdou+lelRWH
-bcQAn2ZAqUupfRTJbdpqt1IzzY8yj2kt
-=g2y8
+iQEcBAEBCAAGBQJRHG3eAAoJEO04vUmVeoRjKW4IAJDqkhOp1hAOPOIl+Bixm3K1
+9ZhF0thamUXtrJdHOedmsPKMqet01FOhin4381H2fTY7FAmLNAdrMsgxgRtjtrLm
+ZJ0JFscfUmq5WmOmpzBS+BVe7DKdjgb9ZDOlUCY1yeeptDxiDc+c3xKL7x/nzNNC
+zViMy0Y5ws0BwhqHX3/oW3FntVIp0HYmNK5YFWxZxtyi2KZG4KSLvhM7SQax5+Vm
+CeEFmuqXiEXb82fj6nsNA4pevGRkZfkredTtdjQuPaLax3BduwS8QoJkTO1SOfa3
+wrqRurpr8H6dppjxK5MY/Ry20gi1PdnuOtzwkS2HF0DMxH0cYhgMBpxHpa4yQuM=
+=dr7F
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/vuze-coreplugins/vuze-coreplugins-4.6.0.2.ebuild b/net-p2p/vuze-coreplugins/vuze-coreplugins-4.6.0.2.ebuild
deleted file mode 100644
index 524083a18e06..000000000000
--- a/net-p2p/vuze-coreplugins/vuze-coreplugins-4.6.0.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze-coreplugins/vuze-coreplugins-4.6.0.2.ebuild,v 1.1 2011/02/08 23:37:18 caster Exp $
-
-# eventually this should be built from source...
-
-EAPI=2
-
-inherit eutils
-
-PLUGINS_N=azplugins
-RATING_N=azrating
-UPDATER_N=azupdater
-UPNPAV_N=azupnpav
-PLUGINS_V=2.1.6
-RATING_V=1.3.1
-UPDATER_V=1.8.17
-UPNPAV_V=0.3.6
-PLUGINS_DIST=${PLUGINS_N}_${PLUGINS_V}.jar
-RATING_DIST=${RATING_N}_${RATING_V}.jar
-UPDATER_DIST=${UPDATER_N}_${UPDATER_V}.zip
-UPNPAV_DIST=${UPNPAV_N}_${UPNPAV_V}.zip
-
-ALLPLUGINS_URL="http://azureus.sourceforge.net/plugins"
-
-DESCRIPTION="Core plugins for Vuze that are included in upstream distribution"
-HOMEPAGE="http://www.vuze.com/"
-SRC_URI="
-	${ALLPLUGINS_URL}/${PLUGINS_DIST}
-	${ALLPLUGINS_URL}/${RATING_DIST}
-	${ALLPLUGINS_URL}/${UPDATER_DIST}
-	${ALLPLUGINS_URL}/${UPNPAV_DIST}"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="~net-p2p/vuze-${PV}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	mkdir -p plugins/{${PLUGINS_N},${RATING_N},${UPDATER_N},${UPNPAV_N}} || die
-	cp "${DISTDIR}/${PLUGINS_DIST}" plugins/${PLUGINS_N} || die
-	cp "${DISTDIR}/${RATING_DIST}" plugins/${RATING_N} || die
-	cd "${WORKDIR}/plugins/${UPDATER_N}" && unpack ${UPDATER_DIST} || die
-	cd "${WORKDIR}/plugins/${UPNPAV_N}" && unpack ${UPNPAV_DIST} || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/vuze/
-	doins -r "${WORKDIR}/plugins"
-}
-
-pkg_postinst() {
-	elog "Since version 4.0.0.2, plugins that are normally bundled by upstream"
-	elog "(and auto-installed in each user's ~/.azureus if not bundled)"
-	elog "are now installed into shared plugin directory by the ebuild."
-	elog "Vuze may warn that shared plugin dir is not writable, that's fine."
-	elog "Users are recommended to delete the following plugin copies:"
-	elog "~/.azureus/plugins/{${PLUGINS_N},${RATING_N},${UPDATER_N},${UPNPAV_N}}"
-}
diff --git a/net-p2p/vuze-coreplugins/vuze-coreplugins-4.7.0.0.ebuild b/net-p2p/vuze-coreplugins/vuze-coreplugins-4.7.0.0.ebuild
deleted file mode 100644
index 0a2350ae22d0..000000000000
--- a/net-p2p/vuze-coreplugins/vuze-coreplugins-4.7.0.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze-coreplugins/vuze-coreplugins-4.7.0.0.ebuild,v 1.1 2011/11/17 23:27:07 caster Exp $
-
-# eventually this should be built from source...
-
-EAPI=2
-
-inherit eutils
-
-PLUGINS_N=azplugins
-RATING_N=azrating
-UPDATER_N=azupdater
-UPNPAV_N=azupnpav
-PLUGINS_V=2.1.6
-RATING_V=1.3.1
-UPDATER_V=1.8.17
-UPNPAV_V=0.3.8
-PLUGINS_DIST=${PLUGINS_N}_${PLUGINS_V}.jar
-RATING_DIST=${RATING_N}_${RATING_V}.jar
-UPDATER_DIST=${UPDATER_N}_${UPDATER_V}.zip
-UPNPAV_DIST=${UPNPAV_N}_${UPNPAV_V}.zip
-
-ALLPLUGINS_URL="http://azureus.sourceforge.net/plugins"
-
-DESCRIPTION="Core plugins for Vuze that are included in upstream distribution"
-HOMEPAGE="http://www.vuze.com/"
-SRC_URI="
-	${ALLPLUGINS_URL}/${PLUGINS_DIST}
-	${ALLPLUGINS_URL}/${RATING_DIST}
-	${ALLPLUGINS_URL}/${UPDATER_DIST}
-	${ALLPLUGINS_URL}/${UPNPAV_DIST}"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="~net-p2p/vuze-${PV}"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	mkdir -p plugins/{${PLUGINS_N},${RATING_N},${UPDATER_N},${UPNPAV_N}} || die
-	cp "${DISTDIR}/${PLUGINS_DIST}" plugins/${PLUGINS_N} || die
-	cp "${DISTDIR}/${RATING_DIST}" plugins/${RATING_N} || die
-	cd "${WORKDIR}/plugins/${UPDATER_N}" && unpack ${UPDATER_DIST} || die
-	cd "${WORKDIR}/plugins/${UPNPAV_N}" && unpack ${UPNPAV_DIST} || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/vuze/
-	doins -r "${WORKDIR}/plugins"
-}
-
-pkg_postinst() {
-	elog "Since version 4.0.0.2, plugins that are normally bundled by upstream"
-	elog "(and auto-installed in each user's ~/.azureus if not bundled)"
-	elog "are now installed into shared plugin directory by the ebuild."
-	elog "Vuze may warn that shared plugin dir is not writable, that's fine."
-	elog "Users are recommended to delete the following plugin copies:"
-	elog "~/.azureus/plugins/{${PLUGINS_N},${RATING_N},${UPDATER_N},${UPNPAV_N}}"
-}
diff --git a/net-p2p/vuze-coreplugins/vuze-coreplugins-4.7.0.2.ebuild b/net-p2p/vuze-coreplugins/vuze-coreplugins-4.8.1.2.ebuild
index be2451a28df0..b6d6eda40ccd 100644
--- a/net-p2p/vuze-coreplugins/vuze-coreplugins-4.7.0.2.ebuild
+++ b/net-p2p/vuze-coreplugins/vuze-coreplugins-4.8.1.2.ebuild
@@ -1,25 +1,21 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze-coreplugins/vuze-coreplugins-4.7.0.2.ebuild,v 1.1 2012/03/10 05:59:46 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze-coreplugins/vuze-coreplugins-4.8.1.2.ebuild,v 1.1 2013/02/14 04:42:55 dirtyepic Exp $
 
 # eventually this should be built from source...
 
-EAPI=2
+EAPI=5
 
-inherit eutils
+# don't forget to update these when bumping the version
+PLUGINS_V=2.1.7  # http://www.vuze.com/plugins/details/azplugins
+RATING_V=1.3.1   # http://www.vuze.com/plugins/details/azrating
+UPDATER_V=1.8.17 # http://www.vuze.com/plugins/details/azupdater
+UPNPAV_V=0.4.6   # http://www.vuze.com/plugins/details/azupnpav
 
-PLUGINS_N=azplugins
-RATING_N=azrating
-UPDATER_N=azupdater
-UPNPAV_N=azupnpav
-PLUGINS_V=2.1.6
-RATING_V=1.3.1
-UPDATER_V=1.8.17
-UPNPAV_V=0.3.9
-PLUGINS_DIST=${PLUGINS_N}_${PLUGINS_V}.jar
-RATING_DIST=${RATING_N}_${RATING_V}.jar
-UPDATER_DIST=${UPDATER_N}_${UPDATER_V}.zip
-UPNPAV_DIST=${UPNPAV_N}_${UPNPAV_V}.zip
+PLUGINS_DIST=azplugins_${PLUGINS_V}.jar
+RATING_DIST=azrating_${RATING_V}.jar
+UPDATER_DIST=azupdater_${UPDATER_V}.zip
+UPNPAV_DIST=azupnpav_${UPNPAV_V}.zip
 
 ALLPLUGINS_URL="http://azureus.sourceforge.net/plugins"
 
@@ -43,11 +39,11 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}"
 
 src_unpack() {
-	mkdir -p plugins/{${PLUGINS_N},${RATING_N},${UPDATER_N},${UPNPAV_N}} || die
-	cp "${DISTDIR}/${PLUGINS_DIST}" plugins/${PLUGINS_N} || die
-	cp "${DISTDIR}/${RATING_DIST}" plugins/${RATING_N} || die
-	cd "${WORKDIR}/plugins/${UPDATER_N}" && unpack ${UPDATER_DIST} || die
-	cd "${WORKDIR}/plugins/${UPNPAV_N}" && unpack ${UPNPAV_DIST} || die
+	mkdir -p plugins/{azplugins,azrating,azupdater,azupnpav} || die
+	cp "${DISTDIR}"/${PLUGINS_DIST} plugins/azplugins || die
+	cp "${DISTDIR}"/${RATING_DIST} plugins/azrating || die
+	cd "${WORKDIR}"/plugins/azupdater && unpack ${UPDATER_DIST} || die
+	cd "${WORKDIR}"/plugins/azupnpav && unpack ${UPNPAV_DIST} || die
 }
 
 src_compile() { :; }
@@ -63,5 +59,5 @@ pkg_postinst() {
 	elog "are now installed into shared plugin directory by the ebuild."
 	elog "Vuze may warn that shared plugin dir is not writable, that's fine."
 	elog "Users are recommended to delete the following plugin copies:"
-	elog "~/.azureus/plugins/{${PLUGINS_N},${RATING_N},${UPDATER_N},${UPNPAV_N}}"
+	elog "~/.azureus/plugins/{azplugins,azrating,azupdater,azupnpav}"
 }
diff --git a/net-p2p/vuze/ChangeLog b/net-p2p/vuze/ChangeLog
index 218d95f17ca5..ca12b7e5ca57 100644
--- a/net-p2p/vuze/ChangeLog
+++ b/net-p2p/vuze/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/vuze
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.55 2012/08/21 00:34:13 dirtyepic Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/ChangeLog,v 1.56 2013/02/14 04:45:55 dirtyepic Exp $
+
+*vuze-4.8.1.2 (14 Feb 2013)
+
+  14 Feb 2013; Ryan Hill <dirtyepic@gentoo.org> -vuze-4.6.0.2.ebuild,
+  -vuze-4.7.0.0-r1.ebuild, -vuze-4.7.0.2.ebuild, +vuze-4.8.1.2.ebuild:
+  Version bump (bug #456880). Remove old.
 
 *vuze-4.7.1.2 (21 Aug 2012)
 
diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index 42d0a7664124..636b50a5f543 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -5,22 +5,22 @@ AUX build.xml 2343 SHA256 56fe791e654e16bafdac9783a1290576fa39fc3e83af162475937a
 AUX vuze-4.1.0.0-pre 1850 SHA256 aae3963e55330eb292176052a2cd72b8a9c322fd63fb71bb0fe6456df7d329e5 SHA512 04c5a77bff69e50963f3122c46f549dec78e462bfa0697b32ffe8630d22612a64f1adc52bc8d7d8868d972c4bdac3082a1e9b513459d9f97915ad87d05ab2b4a WHIRLPOOL 8d20a2850dc9724f3e02bc69158faaee931035fd98d7c902c6973e7197db17908e6bc67deeb516bba1fd4b4ff8defc4ca67beb8b11a6305fa09e8296d06f9c19
 AUX vuze.desktop 164 SHA256 4fbc293d66810bcd4eec210d00d5ea97f5e49acdd10197a52e361ed11b8718ed SHA512 4d68ed3af2c983435d1014ea1281076fd5d1171b23ebbe7cc8d7e6c45b39b036e7f4660fce81481ba3b7bddd29c8255ce22bbb79230f77c6ecfdecb24736d480 WHIRLPOOL 822e059e377141864f465d4de7915651a609ef69c8d67eedc85bd1c60a2b605882cad0c63b592329b369e34f8877e1c36bc344f414be20818bccf39d1f88ec25
 DIST Vuze_4510_source.zip 9181967 SHA256 f92360f48e87c3a1d3edcfc2239ef69276792584292e00a48eac1eac4bd22e7f
-DIST Vuze_4602_source.zip 9245089 SHA256 7503b3aaafd0df5c8b96756f2d8b467bcd52f47556731c606ee806081d6583ff
-DIST Vuze_4700_source.zip 9201613 SHA256 398338e2d1edad58b358717706ed9d6f49a98184860026a38c304b6364a687f6 SHA512 f584d880b6eb99caeb1898f1430c12ad20bed7c1b589e7c560824a545e3bab3e22526ac27205005466f0af73ba270d3973fdd2a4d5851ab3c22756b53e7f6ce7 WHIRLPOOL 91d70734987df7ecc4431c533ae8d5a09b11759f805ae993f5bb0f82472e56af9c2b11d52cd5028185f7fcc2076b445ba5ae380bb466a7a1825f97ea97fea49c
-DIST Vuze_4702_source.zip 9212135 SHA256 b7dcd9a11f600afb2b96b9a139f76f8f33994a54ddf630945861cd229c4b1bf7 SHA512 fa060b006aca75149d6d4ab1a13ce679c40ae07340c1d7e09ccba32de1e1caddc089d0e461bae7bc1abf9f1de582bc8f045d9821f335628f3104ed40c347dbcb WHIRLPOOL 520dddadc791a135f3c95fdbe1ee1c6e3bb4b828016cdf79d69da49da568d9de4bfec98b796d071dd451b015130c8f4df7c57b692a22bfd89541f608851c92a3
 DIST Vuze_4712_source.zip 9338535 SHA256 538b60811e5a5c41d20b4e3eb96c75b3949a716d7f880d1f96a0cde3c28429e5 SHA512 4ae9d4b057d00c3b69adcd3dcbe617698e3710a8107fcc600a94e8a5a39cde02ce1d35b2bc4e8777270aa197f0355807c02d91ff2c8c3f64a03133271cdd5f9b WHIRLPOOL 4b0c326fc2a912e3e02fd0841dc998573b2922b38d160c0ac439caa394ab09542c04fc87ea9e385c62a13ab15a28f847a1f57095611066ec7311e058b94079d6
+DIST Vuze_4812_source.zip 9530217 SHA256 8ad02ae61ac1c515cb3226b95b34d4fe036faa64e725b64fdcb5ef7d1cb9633d SHA512 7007c91f829c57d0f08b9da4ea3fcc8820efe14aeec7286cf764e5ac2d7d165f3a14abc6b0e92a617e21b45803f7c121fb00ddd8c5e8d9664509eb3337fc65bf WHIRLPOOL bc8823e053fa2f86161234c77f4873f2035a111361d60ee8c75937710774defec577651a10acf909bb170e600dc2775a5dbe2cf626649729e86f4a04e02a46d9
 DIST vuze-4.5.0.2-gentoo-patches.tar.bz2 3143 SHA256 972cf16d88d8605f93b77a84770b6512d54ae8281a0d4c06b66890a69deb6c49 SHA512 aacaeb404d9b7dbb40d89b04f9ad26caf447202b1fcb63d532f5e01dc611152adbc38804563f1a35227a080b2eadec0e2e42d0baa163d1d5489eec65cd28f83d WHIRLPOOL a7dd533676c428a00caddc2d4d4c008feec1a1201bb9aef7b7ed9c25d41405344d89bc9f70d442f043beb7aaf6db7d73582cc46edfa3665d599b2635e51b1ee7
 EBUILD vuze-4.5.1.0.ebuild 3991 SHA256 ad5d1dd4fa82bdd135f31463b5dfd044ef8c3c97b660e4e278afa683ccfb1b4d SHA512 cc3c2ee0a932d4847485633b24c56285c6ecb26c8c67f80305ca8023e7dd04e23c73b4cd49965800c90c1228b18f4e142dec8665f2a1d3a872f851291a008f00 WHIRLPOOL 593065cf5dcd86c3466159c6b346946a0288185ffdef6a7cf0f4f2112f61e1603a3dec5beeefb4c0b0cb9e6bb1c4e875438cc000333a7330e195ef733d0d20c3
-EBUILD vuze-4.6.0.2.ebuild 4118 SHA256 8f533fad5796d5704c942c80477aff7db586a63a349b27537da47eaec5f19c4b SHA512 6b2f7f90061771e8d8571adbb01cdc2de7730b0fcc0743c9a9b7ac074212715071ec3b1f5e9739e0ec7cffb441a3f9194c12b3d8fb37012bc1ffbbc186c4f55f WHIRLPOOL f5bad58b0339602ca2c1a8e7ca61529d02c48b0077b02035c2d66fcb9680320014d25c79bfde22c087a4a944455302ea26cea795c326d989274c7fe69dfb4ef6
-EBUILD vuze-4.7.0.0-r1.ebuild 4385 SHA256 bc2e2d66ee9ba0b11d47bb92d5bb43f5c84152820fea103b356c7242f4f51df2 SHA512 9b00ffdae9150fc7cf40477a99c745a8c34a0d0b015a22918a5bd606f49645b7a08687a2c9f4ca911679a5deb7c640b245cc4a5d8de166fb4134fab759dffb34 WHIRLPOOL 3c43481557e4b6b134368249b6ba0af42976b7cc8338285021f0b3e606c464892a96d3c932b6ae0f07adb4fe44e339814eb2c974975f845787cc2f2b64f3d655
-EBUILD vuze-4.7.0.2.ebuild 4401 SHA256 6e58ffff6114d6390614357e1b654574097975dd6e9e97e027b88fdd804dd105 SHA512 4e0e25fe5a812c56d095bf42c29330d39a6ccb73638539ed5f8de92c4dfe5990d3f72d2875d14a0f55ac632bb33dcc86bdc6c136041021d48bac83f09140183d WHIRLPOOL ed7d7498a1ff95f9cb28a58b4d33a86c6a365d27ba7d4835fdacee603ad88d2da64aea52ec7c24d1b645337f4dbcff7e0fa2884021a7e7198f44623d7d3eeb9b
 EBUILD vuze-4.7.1.2.ebuild 4406 SHA256 2b8f9d9721765298cbc8546bcd230fcf391cd088844fe2c69e3e5f09a5060851 SHA512 cfef8362b6aea8273e51c6daf7c7bc0e51f9802551d392a869f3a8eb0b5bfabbe95147f7c6e7ab9a49da5563e0dd87695320427c593b395532672a759ce8995a WHIRLPOOL 048c8bda33275dfc21ae194fe94e1ceddae2d673ec88b507e4e73cac564a2a22b027d01e531848b9d785157a89a24cc8feeef0155ea12df11acde54a9d52ab56
-MISC ChangeLog 26412 SHA256 e0be070bf86cd7b2f9bd21c6786526aa18d6e1263e56f734a7a60d9eb2209627 SHA512 bb7b7e1cf696f3ebdf51ec9e905aff1c3856ad957c02938bd8c5cb0efac279004ef5c2735582fada03b6e26781235e6b8156db2d40386326cc4b6076ab834d87 WHIRLPOOL 8daad2aea4927960396f0d53e43317715ae110e6e50797f2e1df9ea574100621296dc66a0b4f160015c262906f5abf3d265818c948131e5fa74add31a85ac56a
+EBUILD vuze-4.8.1.2.ebuild 4378 SHA256 8a9b2b4bfd4f00ceac2d9679a3672cc6b297fd687b301cf67640846a880eb90b SHA512 f2fac4eb38261208a21e6597417e82a15ce05e0bb9c4e67c0dcabfcdea1c3509501448958533f25bc62900ebbf9725556b9192c6e0ea2429105ac700632a4ed6 WHIRLPOOL fb94fe9a224ff75b113bc9cf1c37ce05219d657b27b2b11c1d512ff71047116e870fc2a3050a785ebe9096736f8a1aa7a60b08f2be6078ff0d0c524806232dfe
+MISC ChangeLog 26625 SHA256 7d7dd1f545f09f06906961b7f95bc2e1fda9bc72a0f18c7f4b4b840d533bfbc6 SHA512 458c1bf19bb3922c0f467a46e65d76fe6ace2d0d635a49d2ff3f2525604632ed7dae02dfee6f381a6f2a46b264102b43a4c71be89192d317a11ff1eac028aa51 WHIRLPOOL 2190b0e2be4a5337a5b2cec19d2a9de7ed888ffa56e056385356531990bb81f110fd13c8579bd0d2f96c4114907d2c8dead81d9ce929fe34b9833547547db1e2
 MISC metadata.xml 250 SHA256 be27a3251cfe700a711e2f9a2cba56b7dfc088c5d1e7ef3874f33348401c845f SHA512 b6556af6ea993229b1d549753e7232b75fa3ea0abc0756c408e6adfe4e834b7f57648a656e1351d3171879ad5e6617dc89f553e19425c818804ef12a1430e5cd WHIRLPOOL 7b8e4ac0e134101d511ae80a6fc70698ce5585ba5b58f3c5242c5a13e1ec9433b7f27b1554517e6099ab984e8f11db3a43a3e47ec22d6ccf8e3772cf6ee6927f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAy2fsACgkQiqiDRvmkBmKBKQCg2Cmr7djPQulkW80JJHDxd5dH
-JWkAn3wib/gInENIG8KvRu0RR541h0SR
-=IWVg
+iQEcBAEBCAAGBQJRHG6OAAoJEO04vUmVeoRj8PwH/Rc4WBQq/lEibJ5SYicdt/EW
+ynULix0edXcNtHxpms2Ovn2TDi7mIF2fTt2urR/3QfKCkcgiPCvaUIeLdS87LVjC
+Bw5B6Y2iQtwDxH2+DDfw91Y64Hllt8sWrCiEA7+4hAalUzc/o8+PV8v9s9ylSL3/
+sGcUrloEqYb3JfpaEUpwUB1r/ff4cBkWtuV2T3ZlvtbA/wCiBg0PuLkxEwlbgpgC
+eLbEEAfwJEaJxqfMjvkBq1VNU0czPCgSX0RpIXgkQGHiNKt1VONSvFDAGZVJcWUo
+Jqtro6Acn+/I/lZZ/cc2OwIZleBSnD91HHtGqubeJMnAZPKnxeLvTwiO5ByJBiU=
+=TZS+
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/vuze/vuze-4.6.0.2.ebuild b/net-p2p/vuze/vuze-4.6.0.2.ebuild
deleted file mode 100644
index aac2e0172b6e..000000000000
--- a/net-p2p/vuze/vuze-4.6.0.2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.6.0.2.ebuild,v 1.2 2012/04/17 11:15:29 ssuominen Exp $
-
-EAPI=2
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils fdo-mime java-pkg-2 java-ant-2 versionator
-
-MY_PV=$(replace_all_version_separators "")
-
-PATCHSET_VER="4.5.0.2"
-PATCHSET_DIR="${PN}-${PATCHSET_VER}-gentoo-patches"
-PATCHSET="${PATCHSET_DIR}.tar.bz2"
-SRC_TARBALL="Vuze_${MY_PV}_source.zip"
-
-DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
-HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/${PN}/Vuze_${MY_PV}/${SRC_TARBALL}
-	mirror://gentoo/${PATCHSET}"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-# bundles parts of commons-lang, but modified
-# bundles parts of http://www.programmers-friend.org/
-RDEPEND="
-	dev-java/json-simple:0
-	dev-java/bcprov:1.3
-	>=dev-java/commons-cli-1.0:1
-	>=dev-java/log4j-1.2.8:0
-	dev-java/swt:3.6[cairo]
-	!net-p2p/azureus-bin
-	>=virtual/jre-1.5"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/desktop-file-utils
-	>=virtual/jdk-1.5"
-
-PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
-
-src_unpack() {
-	unpack ${PATCHSET}
-	mkdir "${S}" && cd "${S}" || die
-	unpack ${SRC_TARBALL}
-	# this is no longer needed
-	rm "${WORKDIR}/${PATCHSET_DIR}/0006-Remove-the-use-of-windows-only-Tree2-widget.patch" || die
-}
-
-java_prepare() {
-	# build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4
-	# hopefully that's just a packaging mistake
-	[[ -f build.xml ]] && die "upstream has build.xml again, don't overwrite"
-	cp "${FILESDIR}/build.xml" . || die "failed to copy build.xml"
-
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PATCHSET_DIR}/"
-
-	### Removes OS X files and entries.
-	rm -rv "org/gudy/azureus2/platform/macosx" \
-		   "org/gudy/azureus2/ui/swt/osx" || die
-
-	### Removes Windows files.
-	rm -v ./org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java || die
-
-	### Removes test files.
-	rm -rv org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
-
-	### Removes bouncycastle (we use our own bcprov).
-	rm -rv "org/bouncycastle" || die
-
-	### Removes bundled json
-	rm -rv "org/json" || die
-
-	### The Tree2 file does not compile against Linux SWT and is used only on Windows.
-	### It's runtime-conditional use is thus patched out in the patchset.
-	rm -rf "org/eclipse" || die
-
-	mkdir -p build/libs || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="swt-3.6,bcprov-1.3,json-simple,log4j,commons-cli-1"
-
-src_compile() {
-	local mem
-	use amd64 && mem="320"
-	use x86   && mem="192"
-	use ppc   && mem="192"
-	use ppc64 && mem="256"
-	export ANT_OPTS="-Xmx${mem}m"
-	java-pkg-2_src_compile
-
-	# bug #302058 - build.xml excludes .txt but upstream jar has it...
-	jar uf dist/Azureus2.jar ChangeLog.txt || die
-}
-
-src_install() {
-	java-pkg_dojar dist/Azureus2.jar
-	dodoc ChangeLog.txt || die
-
-	java-pkg_dolauncher "${PN}" \
-		--main org.gudy.azureus2.ui.common.Main -pre "${FILESDIR}/${PN}-4.1.0.0-pre" \
-		--java_args '-Dazureus.install.path=/usr/share/vuze/ ${JAVA_OPTIONS}' \
-		--pkg_args '--ui=${UI}'
-	dosym vuze /usr/bin/azureus
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=204132
-	java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
-
-	newicon "${S}"/org/gudy/azureus2/ui/icons/a32.png vuze.png
-	domenu "${FILESDIR}/${PN}.desktop"
-
-	use source && java-pkg_dosrc "${S}"/{com,edu,org}
-}
-
-pkg_postinst() {
-	ewarn "Running Vuze as root is not supported and may result in untracked"
-	ewarn "updates to shared components and then collisions on updates via ebuilds"
-
-	elog "Vuze has been formerly called Azureus and many references to the old name remain."
-	elog
-	elog "After running Vuze for the first time, configuration"
-	elog "options will be placed in '~/.azureus/gentoo.config'."
-	elog "If you need to change some startup options, you should"
-	elog "modify this file, rather than the startup script."
-	elog "Using this config file you can start the console UI."
-	elog
-
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/net-p2p/vuze/vuze-4.7.0.0-r1.ebuild b/net-p2p/vuze/vuze-4.7.0.0-r1.ebuild
deleted file mode 100644
index 7cb3eed60bfc..000000000000
--- a/net-p2p/vuze/vuze-4.7.0.0-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.7.0.0-r1.ebuild,v 1.2 2012/04/17 11:15:29 ssuominen Exp $
-
-EAPI=2
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils fdo-mime java-pkg-2 java-ant-2 versionator
-
-MY_PV=$(replace_all_version_separators "")
-
-PATCHSET_VER="4.5.0.2"
-PATCHSET_DIR="${PN}-${PATCHSET_VER}-gentoo-patches"
-PATCHSET="${PATCHSET_DIR}.tar.bz2"
-SRC_TARBALL="Vuze_${MY_PV}_source.zip"
-
-DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
-HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/${PN}/Vuze_${MY_PV}/${SRC_TARBALL}
-	mirror://gentoo/${PATCHSET}"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-# bundles parts of commons-lang, but modified
-# bundles parts of http://www.programmers-friend.org/
-RDEPEND="
-	dev-java/json-simple:0
-	dev-java/bcprov:1.3
-	>=dev-java/commons-cli-1.0:1
-	>=dev-java/log4j-1.2.8:0
-	dev-java/swt:3.7[cairo]
-	!net-p2p/azureus-bin
-	>=virtual/jre-1.5"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/desktop-file-utils
-	>=virtual/jdk-1.5"
-
-PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
-
-src_unpack() {
-	unpack ${PATCHSET}
-	mkdir "${S}" && cd "${S}" || die
-	unpack ${SRC_TARBALL}
-	# this is no longer needed
-	rm "${WORKDIR}/${PATCHSET_DIR}/0006-Remove-the-use-of-windows-only-Tree2-widget.patch" || die
-}
-
-java_prepare() {
-	# build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4
-	# hopefully that's just a packaging mistake
-	[[ -f build.xml ]] && die "upstream has build.xml again, don't overwrite"
-	cp "${FILESDIR}/build.xml" . || die "failed to copy build.xml"
-
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PATCHSET_DIR}/"
-
-	### Removes OS X files and entries.
-	rm -rv "org/gudy/azureus2/platform/macosx" \
-		   "org/gudy/azureus2/ui/swt/osx" || die
-
-	### Removes Windows files.
-	rm -v ./org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java || die
-
-	### Removes test files.
-	rm -rv org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
-
-	### Removes bouncycastle (we use our own bcprov).
-	rm -rv "org/bouncycastle" || die
-
-	### Removes bundled json
-	rm -rv "org/json" || die
-
-	### The Tree2 file does not compile against Linux SWT and is used only on Windows.
-	### It's runtime-conditional use is thus patched out in the patchset.
-	rm -rf "org/eclipse" || die
-
-	mkdir -p build/libs || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="swt-3.7,bcprov-1.3,json-simple,log4j,commons-cli-1"
-
-src_compile() {
-	local mem
-	use amd64 && mem="320"
-	use x86   && mem="192"
-	use ppc   && mem="192"
-	use ppc64 && mem="256"
-	export ANT_OPTS="-Xmx${mem}m"
-	java-pkg-2_src_compile
-
-	# bug #302058 - build.xml excludes .txt but upstream jar has it...
-	jar uf dist/Azureus2.jar ChangeLog.txt || die
-}
-
-src_install() {
-	java-pkg_dojar dist/Azureus2.jar
-	dodoc ChangeLog.txt || die
-
-	java-pkg_dolauncher "${PN}" \
-		--main org.gudy.azureus2.ui.common.Main -pre "${FILESDIR}/${PN}-4.1.0.0-pre" \
-		--java_args '-Dazureus.install.path=/usr/share/vuze/ ${JAVA_OPTIONS}' \
-		--pkg_args '--ui=${UI}'
-	dosym vuze /usr/bin/azureus
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=204132
-	java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
-
-	newicon "${S}"/org/gudy/azureus2/ui/icons/a32.png vuze.png
-	domenu "${FILESDIR}/${PN}.desktop"
-
-	use source && java-pkg_dosrc "${S}"/{com,edu,org}
-}
-
-pkg_postinst() {
-	ewarn "Running Vuze as root is not supported and may result in untracked"
-	ewarn "updates to shared components and then collisions on updates via ebuilds"
-
-	elog "Vuze has been formerly called Azureus and many references to the old name remain."
-	elog
-	elog "After running Vuze for the first time, configuration"
-	elog "options will be placed in '~/.azureus/gentoo.config'."
-	elog "If you need to change some startup options, you should"
-	elog "modify this file, rather than the startup script."
-	elog "Using this config file you can start the console UI."
-	elog
-
-	if ! has_version dev-java/swt:3.7[webkit]; then
-		elog
-		elog "Your dev-java/swt:3.7 was built without webkit support. Features such as Vuze HD Network will not work."
-		elog "Rebuild swt with USE=webkit (needs net-libs/webkit-gtk:2) to use these features."
-	fi
-
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/net-p2p/vuze/vuze-4.7.0.2.ebuild b/net-p2p/vuze/vuze-4.8.1.2.ebuild
index 59bf8108bdfe..8f26aa631015 100644
--- a/net-p2p/vuze/vuze-4.7.0.2.ebuild
+++ b/net-p2p/vuze/vuze-4.8.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.7.0.2.ebuild,v 1.3 2012/06/05 15:04:15 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/vuze/vuze-4.8.1.2.ebuild,v 1.1 2013/02/14 04:45:55 dirtyepic Exp $
 
-EAPI=2
+EAPI=5
 
 JAVA_PKG_IUSE="source"
 
@@ -33,7 +33,6 @@ RDEPEND="
 	>=dev-java/commons-cli-1.0:1
 	>=dev-java/log4j-1.2.8:0
 	dev-java/swt:3.7[cairo]
-	!net-p2p/azureus-bin
 	>=virtual/jre-1.5"
 
 DEPEND="${RDEPEND}
@@ -48,32 +47,32 @@ src_unpack() {
 	mkdir "${S}" && cd "${S}" || die
 	unpack ${SRC_TARBALL}
 	# this is no longer needed
-	rm "${WORKDIR}/${PATCHSET_DIR}/0006-Remove-the-use-of-windows-only-Tree2-widget.patch" || die
+	rm "${WORKDIR}"/${PATCHSET_DIR}/0006-Remove-the-use-of-windows-only-Tree2-widget.patch || die
 }
 
 java_prepare() {
 	# build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4
 	# hopefully that's just a packaging mistake
 	[[ -f build.xml ]] && die "upstream has build.xml again, don't overwrite"
-	cp "${FILESDIR}/build.xml" . || die "failed to copy build.xml"
+	cp "${FILESDIR}"/build.xml . || die "failed to copy build.xml"
 
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PATCHSET_DIR}/"
+	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/${PATCHSET_DIR}/
 
 	### Removes OS X files and entries.
-	rm -rv "org/gudy/azureus2/platform/macosx" \
+	rm -rf "org/gudy/azureus2/platform/macosx" \
 		   "org/gudy/azureus2/ui/swt/osx" || die
 
 	### Removes Windows files.
-	rm -v ./org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java || die
+	rm -rf ./org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java || die
 
 	### Removes test files.
-	rm -rv org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
+	rm -rf org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
 
 	### Removes bouncycastle (we use our own bcprov).
-	rm -rv "org/bouncycastle" || die
+	rm -rf "org/bouncycastle" || die
 
 	### Removes bundled json
-	rm -rv "org/json" || die
+	rm -rf "org/json" || die
 
 	### The Tree2 file does not compile against Linux SWT and is used only on Windows.
 	### It's runtime-conditional use is thus patched out in the patchset.
@@ -101,7 +100,7 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar dist/Azureus2.jar
-	dodoc ChangeLog.txt || die
+	dodoc ChangeLog.txt
 
 	java-pkg_dolauncher "${PN}" \
 		--main org.gudy.azureus2.ui.common.Main -pre "${FILESDIR}/${PN}-4.1.0.0-pre" \
@@ -113,7 +112,7 @@ src_install() {
 	java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
 
 	newicon "${S}"/org/gudy/azureus2/ui/icons/a32.png vuze.png
-	domenu "${FILESDIR}/${PN}.desktop"
+	domenu "${FILESDIR}"/${PN}.desktop
 
 	use source && java-pkg_dosrc "${S}"/{com,edu,org}
 }