Merge branch 'master' of https://github.com/jamesbroadhead/jamesbroadhead-gentoo-overlay

28 files changed, 315 insertions, 682 deletions

diff --git a/app-admin/kpcli/Manifest b/app-admin/kpcli/Manifest
index 0cb5689..5f661d8 100644
--- a/app-admin/kpcli/Manifest
+++ b/app-admin/kpcli/Manifest
@@ -1,3 +1,8 @@
+<<<<<<< HEAD
+DIST kpcli-2.3.pl 105864 SHA256 a536f01c7db2460d4b31e83fa59dd1200e5194f9a8a626eb8cf429e5a6d4329c SHA512 7df3f4605e9aa631bd1f3c437858fff7fca6dd6037aea90f1740d65eb2418fcff502eb367045771e3706453554965eaef1fed34510229c1727f4c75727bdd941 WHIRLPOOL acf2f77d8067f02bf09f51aa5dba93c8b8d33ea186f0ba37b4321311e462d8373ef7874ae239c12de61c7e4a12f24440cc2b93a2ddcf9adaea129692d96e1c8e
+EBUILD kpcli-2.3.ebuild 917 SHA256 08ddab6cdee3ef35c36279fcff1f35087e59e275005d2e48ef2024264364e67a SHA512 389e4bba2d01fdfac3554721f8ddc97fe474315e96b78a8f93ad61c4e46a31d30a99d03390f4c09c38709f0dfd4cc058df4e71cefb1c3734d4352a98130885a4 WHIRLPOOL 1a9b4342a7f518801a57b3c52bd6e074ea0e900350213a626e2ae23399fabd7304102a0fcd2317ab9a28ed4d7dbaf4ab58a07f2bf341a9a19a566f035a6c62fd
+=======
 DIST kpcli-1.6.pl 72331 SHA256 71949dfe3356bb31e96427cd862f3fd8a73eaff922359e89f5094a87f9f2bdda SHA512 74421ebe1f967c6fe98d6e080b8dc0f96d9e577b876302fecc474a9cbd488b3fe7e60c93acac0c4adf0625cad6c970db693f9c09eb0f86cb5fa4776d3fe33c83 WHIRLPOOL b594ad00b8dcd9906e67b4584888ef1129f357993dcf13989144464a2b935312eb19e65851ced9105485dec237101a35916c9e75fa9e6daa0f863c1952fc2aa4
 EBUILD kpcli-1.6.ebuild 707 SHA256 59b89e915c95dc57bceb2c29309d91be11153360ba76393c6b76df8cb725d517 SHA512 0bf2f2f411d439b74f0a82c7e7cf2ff02191b5a1f6e5c211dc3b907faa8d6e4912ff2fd33f09d06919cc24e29cc279f42439ac6563748e2d8371586620ac69d9 WHIRLPOOL 7282e173ff69e86ebff1ebf9e2f0c2e6d634baf50ac6c1360eee7bb0d0df82aafa74bc529e49cd520c46ebeb0439460b21e676b306147d07779d9658821b5139
+>>>>>>> 128e0df7d8d45773efea3a26acb5d1a762b7a8d2
 MISC metadata.xml 214 SHA256 c1f09dc7d5313cd2da7b82259c7846ed23144d62b15e59680ada90e2b6b4d154 SHA512 aeb2fb354a9ddf41c45a071091a58b91eaf8b25d6d2c49e3e3daa547b591a54530144de4533573160b48dc356289c909612c4e3c80e387f081f88cb39263e130 WHIRLPOOL 54d8861daedd18ca38e4ada0fb71026c612b63946d47a9b34de90d1d6d85c8ce05c0a4b97730f554ea637d73ccce8ed207d33e707c2b8c1dd28af24cf44dd186
diff --git a/app-editors/hexer/Manifest b/app-editors/hexer/Manifest
new file mode 100644
index 0000000..9bcc89b
--- /dev/null
+++ b/app-editors/hexer/Manifest
@@ -0,0 +1,2 @@
+DIST hexer-0.2.3.tar.gz 132116 SHA256 8fb09bd37d0afbbb070cc1663014e656b6ffff73747b952d93ffafe8761e552d SHA512 752f9c32f96f145d39336060437a5438e66d175489bd06eb619f2f136fb24f65c6e883c59b7541a3b52ced0be4e2fe268670da048e1cab6d61e8119a35af13c1 WHIRLPOOL 1a49e24498395dd46e4e12201d5425b8956bd34edcb1242ce95192c69bf7d40a11fb464287140b74851bd08fee229ac30c87bc3d699446441f0fa612d9238a06
+EBUILD hexer-0.2.3.ebuild 553 SHA256 d2206769698d7ac959c5aba5ce8b4adb99e00098b5d64096980d17f2506264f5 SHA512 e27761e0ceaec0f847fc62ba234fc998922b5712900e57cdf52cac44d5828fd507139b1b921fe23d921cca8cb8ee7e94cef12a4add2694061eab849dceabd80f WHIRLPOOL a5f9fb5dad3e385aa20c933c62cd1d72308db6d205eb3ac4daa92c98c78fed3b49defa79fee0dbc31908463128e1252bbdc07f7c55e17c0b40184bb08d110014
diff --git a/app-editors/hexer/hexer-0.2.3.ebuild b/app-editors/hexer/hexer-0.2.3.ebuild
new file mode 100644
index 0000000..3bebef4
--- /dev/null
+++ b/app-editors/hexer/hexer-0.2.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Hex editor with vi/ex-style user interface"
+HOMEPAGE="https://devel.ringlet.net/editors/hexer/"
+SRC_URI="https://devel.ringlet.net/editors/${PN}/${P}.tar.gz"
+
+LICENSE="hexer"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	tc-export CC
+	default
+}
+
+src_install() {
+	dobin ${PN} bin2c
+	doman ${PN}.1
+	dodoc CHANGES README
+}
diff --git a/app-office/gscan2pdf/Manifest b/app-office/gscan2pdf/Manifest
index 8e97e6f..e6bd313 100644
--- a/app-office/gscan2pdf/Manifest
+++ b/app-office/gscan2pdf/Manifest
@@ -1,3 +1,3 @@
-DIST gscan2pdf-1.1.2.tar.gz 604576 SHA256 c8c7e6e4225e9088e92a48abe6f15b86f65920f4c01109285e6eda01a237bc4b SHA512 f64d7a9e2e024f6c5149e4a8acac2690df3efd7c23167b879f28f4acdb5c481ace3d9677f1b55b985fbd97ebc2ec929cb6d2b35c50c62a710d36b8b0e007da50 WHIRLPOOL 7ad21e7a213af17d4944edcac685633009747bd61259f9d3ff6579992e0aaa0f4bbfab08c7a7cb8d592b23f51439b1a5dd151676f73e495adcdfcc18d1d8aa5f
-EBUILD gscan2pdf-1.1.2-r1.ebuild 1463 SHA256 3c43220c0fd228611fe894be2c4ff8f1cc7a0e30526efc99ae001985651a6670 SHA512 4c2345f69b39901165eb77c1164a5f3bd41860512d8e818b492e9b9f975eb56c38770f837b3724451bcc9154b86fb8ca9f5bd6da2ecb6f6eefe9d3bee9df8010 WHIRLPOOL 1fcb9fa4cf4a3e676572f9319ad2df49f46ace0b5a1bf37ef64edf85c83c00c995f7d07e30fa55943defc289b69c10330e6b09278da8ec82f0cf862d0d20baa0
+DIST gscan2pdf-1.2.7.tar.gz 667971 SHA256 1fc2cc697b75c6fd0be153d1df26a1fccccbae32f55659d34197faf5a536aedc SHA512 fb048b8b9100351e8998b86e74e5d3d11a3c024f41365789701f9d8b5c35ff0f19ba9de9fe83e66d45f8a9baf9c60449840a6d25f10ad8a61b390d945a6a92de WHIRLPOOL 1951dec8a501a695fb6120c4ea148fc8e4cf85f686397294ab08127161aa4c167237aeb37b3bac1aea0c8d5d0dc27deca2a0646c8bbebfce82a226e22072f7f2
+EBUILD gscan2pdf-1.2.7.ebuild 2097 SHA256 496cc6bc5467d5652aeb8e4e8081b590e75aee2de6ca3bac756612c659bf3fab SHA512 8e98cfb551817d9befe709ffa3eade73d519d18d3c4ea03a4b06b9a55ebbd0d83751ff92b17c0ab39c4b3a6d8cc9d414bf69d67172c44bccd16ec9c4b42b28ec WHIRLPOOL a8c7454795ca85635bfd7639fe89f0401c232838f66d07c186471a96d5b4295b1856773693271414897ee5610e7f14cc50be4b4f1f4f7ba66d10f598c27edca9
 MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
diff --git a/app-office/gscan2pdf/gscan2pdf-1.1.2-r1.ebuild b/app-office/gscan2pdf/gscan2pdf-1.1.2-r1.ebuild
deleted file mode 100644
index d6fa6c2..0000000
--- a/app-office/gscan2pdf/gscan2pdf-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-inherit perl-app
-
-DESCRIPTION="GUI to produce PDF or DjVu files from scanned documents"
-HOMEPAGE="http://gscan2pdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-# https://bugs.gentoo.org/show_bug.cgi?id=254704
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# test only: dev-perl/Test-Perl-Critic
-DEPEND="sys-devel/gettext"
-
-RDEPEND="dev-lang/perl[ithreads]
-	>=dev-perl/config-general-2.40
-	>=dev-perl/glib-perl-1.100-r1
-	dev-perl/Goo-Canvas
-	dev-perl/Gtk2-Ex-Simple-List
-	dev-perl/Gtk2-ImageView
-	>=dev-perl/gtk2-perl-1.043.1
-	dev-perl/HTML-Parser
-	>=dev-perl/Locale-gettext-1.50
-	dev-perl/Log-Log4perl
-	dev-perl/PDF-API2
-	dev-perl/Proc-ProcessTable
-	dev-perl/Readonly-XS
-	dev-perl/Sane
-	dev-perl/Set-IntSpan
-	dev-perl/Try-Tiny
-	virtual/perl-Archive-Tar
-	media-gfx/imagemagick[perl]
-	media-gfx/sane-backends
-	media-libs/tiff"
-
-src_install() {
-	perl-module_src_install
-	dodoc History
-}
-
-pkg_postinst() {
-	elog "Optional dependencies:"
-	elog "app-text/cuneiform, app-text/gocr, app-text/tesseract" \
-		"(or OCRopus, not in Portage) - for OCR"
-	elog "app-text/unpaper - image post processing utility"
-	elog "dev-perl/Gtk2-Ex-PodViewer - for displaying help"
-	elog "app-text/djvu - DjVu support"
-	elog "media-gfx/sane-frontends - for ADF scanners"
-	elog "x11-misc/xdg-utils - required for email as PDF"
-}
diff --git a/app-office/gscan2pdf/gscan2pdf-1.2.7.ebuild b/app-office/gscan2pdf/gscan2pdf-1.2.7.ebuild
new file mode 100644
index 0000000..43e471f
--- /dev/null
+++ b/app-office/gscan2pdf/gscan2pdf-1.2.7.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# Petr Pisar, https://bugs.gentoo.org/show_bug.cgi?id=254704
+
+EAPI="5"
+
+inherit perl-app
+
+DESCRIPTION="GUI to produce PDF or DjVu files from scanned documents"
+HOMEPAGE="http://gscan2pdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-3 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="adf djvu email help cuneiform gocr +tesseract tiff +unpaper"
+
+RDEPEND=">=dev-perl/gtk2-perl-1.90.0
+	>=dev-perl/glib-perl-1.220
+	dev-perl/Gtk2-Ex-Simple-List
+	dev-perl/Gtk2-ImageView
+	media-gfx/imagemagick[perl]
+	>=dev-perl/Locale-gettext-1.05
+	dev-perl/Config-General
+	dev-perl/PDF-API2
+	dev-perl/Sane
+	dev-perl/Set-IntSpan
+	dev-perl/Goo-Canvas
+	dev-perl/HTML-Parser
+	dev-perl/Readonly
+	dev-perl/Log-Log4perl
+	dev-perl/Try-Tiny
+	dev-perl/List-MoreUtils
+	dev-perl/Proc-ProcessTable
+	virtual/perl-Archive-Tar
+	virtual/perl-threads
+	virtual/perl-threads-shared
+	virtual/perl-Getopt-Long
+	virtual/perl-Data-Dumper
+	virtual/perl-Carp
+	virtual/perl-File-Temp
+	adf? ( media-gfx/sane-frontends )
+	djvu? ( app-text/djvu )
+	email? ( x11-misc/xdg-utils )
+	help? ( dev-perl/Gtk2-Ex-PodViewer )
+	cuneiform? ( app-text/cuneiform )
+	gocr? ( app-text/gocr )
+	tesseract? ( app-text/tesseract )
+	tiff? ( media-libs/tiff )
+	unpaper? ( app-text/unpaper )"
+DEPEND="${RDEPEND}
+	media-gfx/sane-backends"
+
+src_install() {
+	perl-module_src_install
+	dodoc History
+}
+
+optfeature() {
+	local desc=$1
+	shift
+	while (( $# )); do
+		if has_version "$1"; then
+			elog "  [I] $1 to ${desc}"
+		else
+			elog "  [ ] $1 to ${desc}"
+		fi
+		shift
+	done
+}
+
+pkg_postinst() {
+	optfeature "Send to mail" x11-misc/xdg-utils
+	optfeature "Scanning via ADF" media-gfx/sane-frontends
+	optfeature "OCR support" \
+		app-text/gocr \
+		app-text/tesseract \
+		app-text/ocropus \
+		app-text/cuneiform
+	optfeature "Convert/scan to DJVU" app-text/djvu
+	optfeature "Post-process scans with unpaper" app-text/unpaper
+	optfeature "Convert/scan to TIFF" media-libs/tiff
+	optfeature "Display help" dev-perl/Gtk2-Ex-PodViewer
+}
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index 9fd6c7e..d4355fa 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -1,3 +1,3 @@
-EBUILD libimobiledevice-9999.ebuild 1705 SHA256 e6632898538d98375d1e1094f779d9611ac49d75260a1b8c25dc7e0a7248d02d SHA512 499048ca3c84bc2ae10a0db0822c8e22cecc01e5c5aa4e5b1d79e6fcf5d73a89cb3f54c2e6b40e4eed73afeac270872df115612af0a0e0429e69ff7d4849b0ff WHIRLPOOL b76a3d6ff6795f3cfdc1a93fb221e9aa33c4f40d2a61270d97a15c5885520551df3cb8c93430024583862dbb0a05b08791bb91921a099fc35f5a965ed9ac3943
+EBUILD libimobiledevice-9999.ebuild 1685 SHA256 9662c2668a10d3092b2cf5b88b0d4c6a208421182a0e03b0652bda0534df0bcc SHA512 40cf6b678504987aca5e9788ab2a9a989c4d002379a7dec56d27e2173e73994c95ae761b456140b77ba12a8adccf627ef3b4c40fd1571b3e99bda127d7ff74b3 WHIRLPOOL 101ffa0c5e661bf59922d5df88b9c16d3e61cc3637042fa701191411b67bac7cd3fc2910c8935225f64967eb44b317ef6b894878d5322c68e270a8404867d841
 MISC ChangeLog 3479 SHA256 ccf938f01e5364081c5a932c2566118465ef121baa4a2a2678454dad028fe069 SHA512 c073b6bcf2aae5b13751576456b05982243699cfd617ce425c3122599a727cd32db973fc59656d932da990c38fad990955362dbadddacbfbd310495e611ea3f5 WHIRLPOOL 626d5d2ef0dc35116ed8c248a39d43a9c06d54bdc9ff134d8576a526a789934f35ffcfc7c3f675e5ed944474aab1f1d216261375d8c6a7ec0f8ef04f2777c92b
 MISC metadata.xml 218 SHA256 983941334731e33b40df7a8643ee1f0e415ff4a4e2c90e1a4ac80a852792fb47 SHA512 1388f0c7302e8d8a5f9f0b0a38c316737804b9b3c8a7d22274bc54f9d29ebb3bbd0027b39726fbf291419c234aa19d5017d3de8d9cc8b9eaf45bd53e75b80a9d WHIRLPOOL 57d700c6d3fb033e00dafc7cfb1696fc694583041a7073596b21ab3c5bff44d5750633718382866389ae3b53e84c988eb3cc4b6d9e24ac6615ec2d26512d3216
diff --git a/app-pda/libimobiledevice/libimobiledevice-9999.ebuild b/app-pda/libimobiledevice/libimobiledevice-9999.ebuild
index 9f1a03b..173c390 100644
--- a/app-pda/libimobiledevice/libimobiledevice-9999.ebuild
+++ b/app-pda/libimobiledevice/libimobiledevice-9999.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.libimobiledevice.org/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS=""
 IUSE="python static-libs"
 
 RDEPEND=">=app-pda/libplist-9999[python?]
@@ -49,8 +49,8 @@ src_prepare() {
 }
 
 src_configure() {
-	NOCONFIGURE="set" ./autogen.sh 		
-	
+	NOCONFIGURE="set" ./autogen.sh
+
 	# --with-swig is same as --without-swig wrt #361029
 
 	local myconf
diff --git a/app-pda/usbmuxd/Manifest b/app-pda/usbmuxd/Manifest
index 2085f39..936867e 100644
--- a/app-pda/usbmuxd/Manifest
+++ b/app-pda/usbmuxd/Manifest
@@ -1,3 +1,3 @@
-EBUILD usbmuxd-9999.ebuild 825 SHA256 327e715c9e436c92e0575a35182a3a18e59c963d25e867664c51107117ffbcfa SHA512 40c1fa5ba4646e6e9a039b6c4db55978e01bb714f7b08a6fd5e941bcd7fa7f9f8faa373b374c5e409ba3f5a1c2a8697f6e775b8c3c9f0ca0a6eb9f2cd117cd9b WHIRLPOOL ad0110abccb09e84a6b5a33ccec6468d2720cd552ad8d766fec20c9fbf660c8e422ffa22fa36184cad967693577307345b10863d3730d0172c345fa8e8d1301d
+EBUILD usbmuxd-9999.ebuild 809 SHA256 0a1f204242afc4fe64a609f69e26006ede5e74eb50f44c0f15e59d7ca0357515 SHA512 1cfb054e1fb498f17ff9a640d7a569afa35dfbe275b22c1e16bdecb899fecabc2ec74979621254ef1242419fbe35fc9709e870a23b7fca72092948c2ffbc75cb WHIRLPOOL 743ffceb5d5bc0f441190974d46cd9e8e3d4a27fe01c7bb52b5fb78c064f873b0f75a76cf8708ee0707d7de226a73582741096541be7518b45e25ec1044afb8c
 MISC ChangeLog 2240 SHA256 9d366a092ba5e6de35b3d19781bca3221f8fa7f0ae7064616ce46b298e77a632 SHA512 a706a28eac85e67cb7559158bd4f56e97f28bd0201498bcce798651fee1c4e273e8f7668e209a2e0a2f8ba5ab552a0c8ee8d26909ac700110581f43b99a30641 WHIRLPOOL abe355d3428071ca410760cdc50f1db8779ede95a11a5e272a8b131b729cd89c7a63877a7ab448411a04d71862cdce4e65a8331cd5e7d4745566dbfa0ade7f72
 MISC metadata.xml 158 SHA256 21247a564394680460e294ac138a92903d91b5cafee5cafc38a50656caf965e2 SHA512 1095f62f09baf2c54d8b48f022e8364f73feaa99df7443e770f70e8dd22705ccaaa3f71a946c223c6f1903d0387dfc84693b4f4e3976f65423474221b0b4ac90 WHIRLPOOL 04e0de42ec7067178deb39fc7963229c529b500130ad2757288bc6a2b9e8275fa3e417e7ca290b4cd883d052dffd829aeb4509053e31c38e30bcf8e28270ce3f
diff --git a/app-pda/usbmuxd/usbmuxd-9999.ebuild b/app-pda/usbmuxd/usbmuxd-9999.ebuild
index c9067c4..d7736a2 100644
--- a/app-pda/usbmuxd/usbmuxd-9999.ebuild
+++ b/app-pda/usbmuxd/usbmuxd-9999.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS=""
 IUSE=""
 
 DEPEND="=app-pda/libplist-9999
diff --git a/app-portage/autounmask/autounmask-0.27-r1.ebuild b/app-portage/autounmask/autounmask-0.27-r1.ebuild
deleted file mode 100644
index 114a111..0000000
--- a/app-portage/autounmask/autounmask-0.27-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/autounmask/autounmask-0.27.ebuild,v 1.9 2010/06/05 18:50:45 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="autounmask - Unmasking packages the easy way"
-HOMEPAGE="http://download.mpsna.de/opensource/autounmask/"
-SRC_URI="http://download.mpsna.de/opensource/autounmask/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-lang/perl
-		>=dev-perl/PortageXS-0.02.09
-		virtual/perl-Term-ANSIColor
-		dev-perl/Shell-EnvImporter"
-RDEPEND="${DEPEND}
-		sys-apps/portage"
-
-src_prepare() {
-	epatch "${FILESDIR}"/"${PN}"-noarch.patch
-}
-
-src_install() {
-	dobin autounmask || die
-	dodoc Changelog
-}
diff --git a/app-portage/autounmask/files/autounmask-noarch.patch b/app-portage/autounmask/files/autounmask-noarch.patch
deleted file mode 100644
index 05570b7..0000000
--- a/app-portage/autounmask/files/autounmask-noarch.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- autounmask	2010-08-15 19:25:59.000000000 +0100
-+++ autounmask-noarch	2010-08-15 19:22:13.000000000 +0100
-@@ -40,7 +40,6 @@
- my ($p,$x,$r);
- my @l			= ();
- my $packageToUnmask	= '';
--my $arch		= $pxs->getArch();
- my @repos		= ();
- my $isOk		= 0;
- my %cmdOptions		= ();
-@@ -217,7 +216,7 @@
- 			$p=$1;
- 			
- 			if ($p) {
--				addToKeywords($p,'~'.$arch);
-+				addToKeywords($p);
- 				addToUnmask($p);
- 				last if ($cmdOptions{'noversions'});
- 			}
-@@ -227,7 +226,7 @@
- 			$p=$1;
- 			
- 			if ($p) {
--				addToKeywords($p,'~'.$arch);
-+				addToKeywords($p);
- 				addToUnmask($p);
- 				last if ($cmdOptions{'noversions'});
- 			}
-@@ -237,7 +236,7 @@
- 			$p=$1;
- 
- 			if ($p) {
--				addToKeywords($p,'~'.$arch);
-+				addToKeywords($p);
- 				last if ($cmdOptions{'noversions'});
- 			}
- 		}
-@@ -294,7 +293,7 @@
- # - Subs >
- sub addToKeywords {
- 	my $p	= shift;
--	my $k	= shift;
-+#	my $k	= shift;
- 	if ($cmdOptions{'noversions'}) {
- 		$p=$pxs->getEbuildName($p);
- 	}
-@@ -302,8 +301,10 @@
- 		$p='='.$p;
- 	}
- 	open(FH,'>>'.$keywordsFile) or die('Cannot write to file: '.$keywordsFile);
--	print FH $p." ".$k."\n";
--	$pxs->print_ok("Added '".$p." ".$k."' to ".$keywordsFile."\n");
-+	
-+	print FH $p."\n";
-+	
-+	$pxs->print_ok("Added '".$p."' to ".$keywordsFile."\n");
- 	close(FH);
- 	return 1;
- }
diff --git a/dev-perl/File-KeePass/File-KeePass-2.30.0.ebuild b/dev-perl/File-KeePass/File-KeePass-2.30.0.ebuild
index b69e416..ef6f521 100644
--- a/dev-perl/File-KeePass/File-KeePass-2.30.0.ebuild
+++ b/dev-perl/File-KeePass/File-KeePass-2.30.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 MODULE_AUTHOR="RHANDOM"
 MODULE_VERSION="2.03"
diff --git a/dev-perl/File-KeePass/Manifest b/dev-perl/File-KeePass/Manifest
index 98eac0b..b6c6757 100644
--- a/dev-perl/File-KeePass/Manifest
+++ b/dev-perl/File-KeePass/Manifest
@@ -1,3 +1,3 @@
 DIST File-KeePass-2.03.tar.gz 37010 SHA256 c30c688027a52ff4f58cd69d6d8ef35472a7cf106d4ce94eb73a796ba7c7ffa7 SHA512 f50cdcc52e3f4eb9da17e9e823ae268547f9fafaa534bdc52db1da53564fcc28ebf975e71b9968b5cad617f2964ed3c55022063bc52f910d2478d06ce35d4ba1 WHIRLPOOL 8812a8c02c53f4b1eb3d4958b8a82828cd6815be7cda4b1695f73ba5dcc30dc81f9a90bcad39cdd694a283208f73162d306341ab4cf20dc9f5e3659fa6c6964e
-EBUILD File-KeePass-2.30.0.ebuild 322 SHA256 2453eab3f19578a0aac177031b5035068ff2c6b536e955467336b5f9128d5ac9 SHA512 57f59681a3ed74bb68595af331b841bf494745b3737e4ff0ef391fec5c3f21c1dffef98b9122534c011f14f3655bfcfdf91f2d532ee4532063dcbfa68524bcba WHIRLPOOL 2c56065327803e966301385ddd290d63ad1e162be8e16824f620cceb35cc0d2976212c9ca6793796a383b6d650fcfb4bba055f596a5220c6a257c3f81036dabc
+EBUILD File-KeePass-2.30.0.ebuild 322 SHA256 2f120ac531db148620815a2dcfcba3b78398fd64d8efba24163f379c14d82437 SHA512 f559c823b256af35b369b77bbeed02a91c76f685d5462dc441b9f485d46b08423ab89fddd5283cbdc6224f86d562e5ad803c161c7be5779012dbcb660c898489 WHIRLPOOL cd39451025ba612538d64a78b29adcbfffd5c517597a42f7bea5f9afa507322b19c5b05b0b8fb54993d89ca64d838631ab0e3c7549b7d2aa0e3ea05b445ee2cc
 MISC metadata.xml 214 SHA256 c1f09dc7d5313cd2da7b82259c7846ed23144d62b15e59680ada90e2b6b4d154 SHA512 aeb2fb354a9ddf41c45a071091a58b91eaf8b25d6d2c49e3e3daa547b591a54530144de4533573160b48dc356289c909612c4e3c80e387f081f88cb39263e130 WHIRLPOOL 54d8861daedd18ca38e4ada0fb71026c612b63946d47a9b34de90d1d6d85c8ce05c0a4b97730f554ea637d73ccce8ed207d33e707c2b8c1dd28af24cf44dd186
diff --git a/games-rpg/nwn-cep/ChangeLog b/games-rpg/nwn-cep/ChangeLog
new file mode 100644
index 0000000..9eab6d4
--- /dev/null
+++ b/games-rpg/nwn-cep/ChangeLog
@@ -0,0 +1,84 @@
+# ChangeLog for games-rpg/nwn-cep
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-cep/ChangeLog,v 1.15 2012/10/07 11:26:09 pacho Exp $
+
+  07 Oct 2012; Pacho Ramos <pacho@gentoo.org> nwn-cep-1.68-r1.ebuild,
+  nwn-cep-2.0.ebuild:
+  Rely on unpack.eclass to pull unrar deps, if other RAR alternatives are found
+  to really fully replace unrar, this needs to be discussed centrally with
+  eclass authors instead of in every ebuild using rar files (#244987 by
+  drantin).
+
+  12 Jul 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  nwn-cep-1.68-r1.ebuild, nwn-cep-2.0.ebuild, metadata.xml:
+  EAPI=2; replace built_with_use with has_version
+
+  28 Jun 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  nwn-cep-1.68-r1.ebuild:
+  stable for x86 and amd46 (bug #307379)
+
+*nwn-cep-1.68-r1 (13 Aug 2008)
+
+  13 Aug 2008; Denis Dupeyron <calchan@gentoo.org> +nwn-cep-1.68-r1.ebuild:
+  Rewrote ebuild for version 1.68. Tested and it works with nwn-1.69 too.
+
+  28 Jul 2008; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml:
+  Removing myself from metadata.xml since I am retiring from the project.
+
+  27 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org> nwn-cep-2.0.ebuild:
+  Stable on amd64/x86 for bug #190150.
+
+  21 Aug 2007; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml,
+  nwn-cep-2.0.ebuild:
+  Added a patch from Denis Dupeyron <calchan@gentoo.org> to improve the
+  quality of the ebuild and also to change to using the RAR to save space.
+  Closing bug #180010.
+
+*nwn-cep-2.0 (31 Jan 2007)
+
+  31 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org> +nwn-cep-2.0.ebuild:
+  Added 2.0 ebuild. Ebuild by Benedikt Morbach
+  <benedikt.morbach+bugzilla@googlemail.com> and modified by me. Closing bug
+  #150195.
+
+  20 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org> -nwn-cep-1.52.ebuild,
+  -nwn-cep-1.52-r1.ebuild, -nwn-cep-1.53.ebuild, -nwn-cep-1.53-r1.ebuild,
+  nwn-cep-1.68.ebuild:
+  Stable on amd64/x86 and removing older ebuilds since the older versions of
+  NWN are no longer in the tree.
+
+  06 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org> nwn-cep-1.68.ebuild:
+  Added hou/sou to IUSE.
+
+*nwn-cep-1.68 (05 Oct 2006)
+
+  05 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org> +nwn-cep-1.68.ebuild:
+  Version bump to 1.68 and closing bug #147017.
+
+*nwn-cep-1.53-r1 (25 Jul 2006)
+*nwn-cep-1.53 (25 Jul 2006)
+
+  25 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org> +nwn-cep-1.53.ebuild,
+  +nwn-cep-1.53-r1.ebuild:
+  Version bump.  This closes bug #132978.
+
+  21 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> -nwn-cep-1.50.ebuild,
+  nwn-cep-1.52.ebuild, nwn-cep-1.52-r1.ebuild:
+  Changed DESCRIPTION to mention NWN, marked 1.52 stable on amd64 and x86, and
+  removing older ebuilds.
+
+*nwn-cep-1.52-r1 (17 Apr 2006)
+*nwn-cep-1.52 (17 Apr 2006)
+
+  17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> +nwn-cep-1.52.ebuild,
+  +nwn-cep-1.52-r1.ebuild:
+  Added new 1.52 versions and closing bug #81248 and bug #129900. There are
+  two ebuilds here, 1.52 and 1.52-r1, which are different. The 1.52-r1 ebuild
+  goes with the split nwn/nwn-data ebuilds and is now masked along with them.
+  The 1.52 ebuild should work with the current stable 1.66 nwn ebuild.
+
+*nwn-cep-1.50 (20 Jan 2004)
+
+  20 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Initial import.  Ebuild submitted by Kai Zimmermann #68501 by 
+  dju` / Keri Harris.
diff --git a/games-rpg/nwn-cep/Manifest b/games-rpg/nwn-cep/Manifest
new file mode 100644
index 0000000..7cef82e
--- /dev/null
+++ b/games-rpg/nwn-cep/Manifest
@@ -0,0 +1,4 @@
+DIST CEP_24_a.rar 1020488062 SHA256 2d468615c056f8605ddeb58dc7e3e8610049eb235ca5b92d0bf9ecd494afdc4a SHA512 441f5ec070b5e772476eed362c1e1f36e8c5ccf8d9fbda60003919d2562c78b42e29d333bd0dbf4ddb971b29b8e13295369628ac8e8348ce85b2adef83214477 WHIRLPOOL 5f5663f538dac8d6123de2653e988d53f2eab6f78e175a722cad9eaade62395f7e88b7c39b85bfcb0b3adfbba7fad6862a02b19d8b50778a67b5cff3ab5fe609
+EBUILD nwn-cep-2.4.ebuild 1307 SHA256 f97c7ba529c67c1cf2d7fc291c8c76f50e338e308f4edcaf9a6bcabe50c935e7 SHA512 21a352b156627a9c4bd0e49c9703f69fa4375e918b1341a02970346cd194bb7014eae408ac5c7dff40031e1b15887d35960f0dc233e260fcc0de3dd13768299b WHIRLPOOL 1b3b2fa2b0e2b7f8c3ea2f1f9c04551e7e8169401f59d5fb30f50c3dfe791607f2c65f317affc22e8a6cc1e035d3975db5b23bb1bf4fc21ee3ec211cf653b347
+MISC ChangeLog 3377 SHA256 3ed4efa33f6d6d3400bca88e864c669a69e8149153cb73241639cfd90d555fcc SHA512 a25ec579dce2da0ab3a91dffdca8ef2723f2a5a741ff39087497fb6136f14a85f3163d3da9ca71f7b44318807cd735e4a582e3e7ad79618819a936b71a1fd1ae WHIRLPOOL 36a71d5230b0c28554140cf04307f512ab22145b0d4d8add27fed32fb760dfc70bc5e847cc24956a5906f33e47d0b201d8b736ff4ebd5b75004377992f8007a4
+MISC metadata.xml 303 SHA256 f83b805642c8ad4b1e7cc108e0d4c7254fba9dfad784d10922ad460396e8ff49 SHA512 3f476263bdf5a0b90ecc41f95cb31a5aa461b3abcbd8fc7796cd7c3205ee62369b9e878e124064c76d58ae4dadf1ae23da48d6b7224e19fcb790396cad2f206b WHIRLPOOL 3ff2193b70f3c2bd54c6db0897b86dbd1bdcca6b4ba9c99a4921a0f31fbef2ba2946635c9fc4d9bad409544bf78379721f18c64bd643ae0ffe445a8978e7100e
diff --git a/games-rpg/nwn-cep/metadata.xml b/games-rpg/nwn-cep/metadata.xml
new file mode 100644
index 0000000..c01a252
--- /dev/null
+++ b/games-rpg/nwn-cep/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>games</herd>
+  <maintainer>
+    <email>calchan@gentoo.org</email>
+    <name>Denis Dupeyron</name>
+    <description>maintainer</description>
+  </maintainer>
+</pkgmetadata>
diff --git a/games-rpg/nwn-cep/nwn-cep-2.4.ebuild b/games-rpg/nwn-cep/nwn-cep-2.4.ebuild
new file mode 100644
index 0000000..bbe939f
--- /dev/null
+++ b/games-rpg/nwn-cep/nwn-cep-2.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-cep/nwn-cep-2.0.ebuild,v 1.8 2012/10/07 11:26:09 pacho Exp $
+
+EAPI=2
+inherit eutils games unpacker
+
+DESCRIPTION="High quality custom content addon for Neverwinter Nights"
+HOMEPAGE="http://www.neverwinternights.info/cep.htm"
+SRC_URI="http://vnfiles.ign.com/nwvault.ign.com/fms/files/hakpaks/7849/CEP_24_a.rar"
+
+LICENSE="as-is"
+SLOT="2"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=games-rpg/nwn-1.69"
+
+S=${WORKDIR}
+
+dir=${GAMES_PREFIX_OPT}/nwn
+
+pkg_setup() {
+	games_pkg_setup
+	if ! has_version 'games-rpg/nwn-data[hou,sou]' ; then
+		eerror "${P} requires NWN v1.69, Shadows of Undrentide, and Hordes of"
+		eerror "the Underdark. Please make sure you have all three before using"
+		eerror "this patch."
+		die "Requirements not met"
+	fi
+}
+
+src_install() {
+	local i
+	for i in hak tlk erf
+	do
+		cd ${i}	
+		insinto "${dir}"/${i}
+		doins *.${i} || die "${i} failed"
+		cd ..
+	done
+	
+	cd modules
+	insinto "${dir}"/modules
+	doins *.mod || die "mod failed"
+	cd ..
+
+	cd docs/cep	
+	insinto "${dir}"/docs/cep
+	doins *.pdf || die "pdf failed"
+	cd ../..
+	
+	cd dmvault 
+	insinto "${dir}"/dmvault
+	doins *.bic || die "dmvault failed"
+	cd ..
+	
+	prepgamesdirs
+}
diff --git a/media-sound/kid3/ChangeLog b/media-sound/kid3/ChangeLog
deleted file mode 100644
index 42a614c..0000000
--- a/media-sound/kid3/ChangeLog
+++ /dev/null
@@ -1,212 +0,0 @@
-# ChangeLog for media-sound/kid3
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/ChangeLog,v 1.52 2010/07/21 13:03:05 fauli Exp $
-  
-  13 Mar 2011; James Broadhead <jamesbroadhead@gmail.com> kid3-1.6.ebuild:
-  -DWITH_KDE=OFF now works, extended comment about Tunepimp w. link upstream, renamed vorbis USEflag to ogg in line with the flag description (ogg for container, vorbis for codec), cmake flags are case sensitive, fixed. Bug #357207
-
-  21 Jul 2010; Christian Faulhammer <fauli@gentoo.org> kid3-1.4.ebuild:
-  stable x86, bug 325935
-
-  21 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> kid3-1.4.ebuild:
-  Fix building with USE="flac -vorbis" wrt #325935 by Thomas Kahle.
-
-  28 Jun 2010; Markos Chandras <hwoarang@gentoo.org> kid3-1.4.ebuild:
-  Stable on amd64 wrt bug #325935
-
-  03 May 2010; Alexis Ballier <aballier@gentoo.org> kid3-1.4.ebuild:
-  keyword ~x86-fbsd
-
-*kid3-1.4 (06 Mar 2010)
-
-  06 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> +kid3-1.4.ebuild:
-  Version bump.
-
-  23 Nov 2009; Dror Levin <spatz@gentoo.org> kid3-1.3.ebuild,
-  +files/kid3-1.3-compile-without-vorbis.patch:
-  Fix compilation with USE=-vorbis, bug 294160.
-
-*kid3-1.3 (19 Nov 2009)
-
-  19 Nov 2009; Dror Levin <spatz@gentoo.org> +kid3-1.3.ebuild:
-  Version bump, bug 292753.
-
-  18 Oct 2009; Markus Meier <maekke@gentoo.org> kid3-1.2-r3.ebuild:
-  x86 stable, bug #289293
-
-  16 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> kid3-1.2-r3.ebuild:
-  amd64 stable wrt #289293
-
-*kid3-1.2-r3 (21 Aug 2009)
-
-  21 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> +kid3-1.2-r3.ebuild:
-  USE flac mp3 mp4 +musicbrainz +taglib vorbis
-
-*kid3-1.2-r2 (16 Jul 2009)
-
-  16 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> +kid3-1.2-r2.ebuild:
-  Update libmp4v2 >= 1.9.0 patch to one from upstream.
-
-*kid3-1.2-r1 (12 Jul 2009)
-
-  12 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> +kid3-1.2-r1.ebuild,
-  +files/kid3-1.2-new_libmp4v2.patch:
-  Detect and compile with libmp4v2 >= 1.9.0.
-
-  21 May 2009; Samuli Suominen <ssuominen@gentoo.org> kid3-1.2.ebuild:
-  Move to kde4-base.eclass, thanks to scarabeus.
-
-*kid3-1.2 (20 May 2009)
-
-  20 May 2009; Samuli Suominen <ssuominen@gentoo.org> +kid3-1.2.ebuild:
-  Version bump wrt #266823.
-
-  26 Dec 2008; Raúl Porcel <armin76@gentoo.org> kid3-1.0.ebuild:
-  sparc stable wrt #244022
-
-  17 Dec 2008; Markus Meier <maekke@gentoo.org> kid3-1.0.ebuild:
-  x86 stable, bug #244022
-
-  09 Dec 2008; Brent Baude <ranger@gentoo.org> kid3-1.0.ebuild,
-  kid3-1.1.ebuild:
-  Marking kid3-1.1 ~ppc64 and kid3-1.0 ppc64 for bug 244022
-
-  06 Dec 2008; Thomas Anderson <gentoofan23@gentoo.org> kid3-1.0.ebuild:
-  stable amd64, bug 244022
-
-  06 Dec 2008; nixnut <nixnut@gentoo.org> kid3-1.0.ebuild:
-  Stable on ppc wrt bug 244022
-
-  28 Oct 2008; Tomas Chvatal <scarabeus@gentoo.org> kid3-1.1.ebuild:
-  Update ebuild so it actualy works for kde3 as expected.
-
-*kid3-1.1 (27 Oct 2008)
-
-  27 Oct 2008; Tomas Chvatal (scarabeus) <scarabeus@gentoo.org>
-  +kid3-1.1.ebuild:
-  Add kid3-1.1. Enables kde4/qt4 interface based on installed kde version.
-  Currently preffers kde4 over kde3. If someone wants only nonkde interface
-  for QT4 will not work due to forcing dep in Cmake and for QT3 configure
-  violates sandbox.
-
-*kid3-1.0 (11 Jun 2008)
-
-  11 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
-  -files/kid3-0.5-configure.patch, -kid3-0.5.ebuild, -kid3-0.6.ebuild,
-  -kid3-0.7.ebuild, -kid3-0.9.ebuild, -kid3-0.10.ebuild, +kid3-1.0.ebuild:
-  Bump for #225799. Remove old. Installation of docs was breaking. Punted.
-  If you need documentation for clicking, you're not our audience :-)
-
-*kid3-0.10 (08 Dec 2007)
-
-  08 Dec 2007; Matteo Azzali <mattepiu@gentoo.org> +kid3-0.10.ebuild:
-  Version Bump.
-
-  18 Nov 2007; Alexis Ballier <aballier@gentoo.org> kid3-0.6.ebuild,
-  kid3-0.7.ebuild, kid3-0.8.1.ebuild, kid3-0.9.ebuild:
-  add a check for flac cxx use flag, FLAC++ is needed here
-
-*kid3-0.9 (23 Jun 2007)
-
-  23 Jun 2007; Wulf C. Krueger <philantrop@gentoo.org> +kid3-0.9.ebuild:
-  Version bump as per bug 182997. Added localisation support.
-
-  13 Feb 2007; Markus Rothe <corsair@gentoo.org> kid3-0.8.1.ebuild:
-  Stable on ppc64; bug #164580
-
-  10 Feb 2007; nixnut <nixnut@gentoo.org> kid3-0.8.1.ebuild:
-  Stable on ppc wrt bug 164580
-
-  10 Feb 2007; Christian Faulhammer <opfer@gentoo.org> kid3-0.8.1.ebuild:
-  stable x86; bug #164580
-
-  10 Feb 2007; Steve Dibb <beandog@gentoo.org> kid3-0.8.1.ebuild:
-  amd64 stable, bug 164580
-
-  09 Feb 2007; Gustavo Zacarias <gustavoz@gentoo.org> kid3-0.8.1.ebuild:
-  Stable on sparc wrt #164580
-
-*kid3-0.8.1 (09 Dec 2006)
-
-  09 Dec 2006; Charlie Shepherd <masterdriverz@gentoo.org>
-  +kid3-0.8.1.ebuild:
-  Bump to 0.8.1; thanks to Paolo Pedroni; bug 156020
-
-*kid3-0.7 (05 Oct 2006)
-
-  05 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> +kid3-0.7.ebuild:
-  Version bump, this closes bug #112583 too.
-
-  25 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
-  -files/kid3-0.6-tunepimp04.patch, kid3-0.6.ebuild:
-  Remove musicbrainz support as per bug #140184.
-
-  21 May 2006; Diego Pettenò <flameeyes@gentoo.org>
-  +files/kid3-0.6-tunepimp04.patch, kid3-0.6.ebuild:
-  Add patch for kid3 to build with tunepimp 0.4.
-
-  06 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> kid3-0.6.ebuild:
-  Forcing KDE support on, as kid3 cannot be configured without having the KDE
-  libraries installed. Also fixes bug #111692.
-
-*kid3-0.6 (05 Nov 2005)
-
-  05 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> +kid3-0.6.ebuild:
-  New version (#110998). Make kde support optional. Ad support for vorbis,
-  flac, musicbrainz.
-
-  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> kid3-0.5.ebuild:
-  Stable on ppc.
-
-  20 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> kid3-0.5.ebuild:
-  Stable ppc64 fixing my 2 month old mistake.
-
-  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> kid3-0.4.ebuild,
-  kid3-0.5.ebuild:
-  Stable amd64, sparc, x86.  Added arts to IUSE.
-
-  16 Dec 2004; Markus Rothe <corsair@gentoo.org> kid3-0.5.ebuild:
-  Stable on ppc64
-
-  28 Nov 2004; Simone Gotti <motaboy@gentoo.org>
-  +files/kid3-0.4-configure.patch, kid3-0.4.ebuild:
-  Added a patch to the configure script to honor the arts USE flag. Fixes bug
-  #70703.
-
-  28 Nov 2004; Simone Gotti <motaboy@gentoo.org>
-  +files/kid3-0.5-configure.patch, kid3-0.5.ebuild:
-  Added a patch to the configure script to honor the arts USE flag. Fixes bug
-  #70703.
-
-  01 Nov 2004; Markus Rothe <corsair@gentoo.org>
-
-  kid3-0.5.ebuild:
-  Marked ~ppc64; bug #64642
-
-*kid3-0.5 (20 Oct 2004)
-
-  20 Oct 2004; Patrick Dawson <pkdawson@gentoo.org> +kid3-0.5.ebuild:
-  version bump
-
-  28 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> kid3-0.4.ebuild:
-  Stable amd64 sparc.
-
-  19 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> kid3-0.4.ebuild:
-  Stable x86.
-
-  14 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  +files/kid3-0.4-gcc34.patch:
-  gcc-3.4 fixes provided by Patrick Dawson <pkdawson@buffalo.edu> to close bug
-  #56070. Added to ~sparc and ~amd64.
-
-  03 Jul 2004; Carsten Lohrke <carlo@gentoo.org> kid3-0.4.ebuild:
-  QA: need-kde after R/DEPEND
-
-*kid3-0.4 (28 Apr 2004)
-
-  28 Apr 2004; David Holm <dholm@gentoo.org> kid3-0.4.ebuild:
-  Added to ~ppc.
-
-  26 Apr 2004; Dominik Stadler <centic@gentoo.org> :
-  Add new ebuild for kid3, see Bug 23014.
-
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
deleted file mode 100644
index 0f287dc..0000000
--- a/media-sound/kid3/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX kid3-1.6-id3form-usability.patch 4099 SHA256 b4e0ed0668d326971d72ab13fd8ae137ee92d2693ddfbfc41913dc97bf1c462f SHA512 af3efcfcdbef6068160d91b5ec4844513e03458d56489a8eb36a4be26cbcdcdfdfd313b919ad495c36c4b620a5d2abbaba2bd6c4543d502b88b7aaa2641b71a1 WHIRLPOOL 9a349719bb0da38c2d521cd2f0870ef5128219c532a86bbc92235e7f39f076e93c5ac07fd6b0284df490112ba9ef2499e818880054ab6b15d80ef62350317ea7
-AUX kid3-id3form-understandability.patch 2201 SHA256 88b696f50315ec2382c839bc9852535813b67817e13f7bb60f2cc4fa73f1e1e1 SHA512 3614da272cdd69824ceafe6bc764fd8f0036e5fcdd8331919d610bb9190a586ab8391efc6e76575d63425c76666b3d7f4e978dc119a77303fce271da56ebc2ea WHIRLPOOL 3c7de0333463f0dbeb806fee7674d076641be5ef620797f4f704952b00d7d07d6cc96b7411f4da4d302f7d5773493bb473b42c114464c4b02b3ed365a20461ce
-DIST kid3-1.6.tar.gz 1478393 SHA256 974208d5545a9a2bb192dc1a3cfaa64f2269d4f7001d150255ce3f3a3f6723c2 SHA512 cd2acdb14b16b212187f4b4c0144e7cf4d41fa6d4c6cd1c7822e5e92393490abdb6a5071ec501051f37806538af555865cd53b830073db4f0de62242e8f84fd9 WHIRLPOOL 30647ab7b02f8ee173f59c3730c6283f93fecfd14e50c366743cb84b0801fba49b253b3c5a83c4b2d786e142818243e5cc26836ecd2b717793a853d752a7a74c
-DIST kid3-2.0.tar.gz 804587 SHA256 bdf4ff4f929d7ad6d5b0a6b2661e76ac83216ae94d84a7886f68011c3b7110cd SHA512 dc9b065316e020853b79b2d89f626e28adf4ee29ed58f8fdec844a09d1fdd40e24e7b9f4f4b66ddace7a2bac788ff9493c053e93aaa3fbb436b5dbc4528d30e1 WHIRLPOOL 21a57599757a4e1d0951cfd257dc7c71045890f44fe80b84cdb56703bb9d41b9a84e2a5e8c7fb6627ebca433efe33df2173f9b4a7ee0fbdbcfe72e6332d55da4
-EBUILD kid3-1.6-r1.ebuild 1553 SHA256 b471b168266c7faeb6e622f8136f4421e7800dfc7375d035d78f5256e81ddd40 SHA512 26432fa35267cdeb487c816823ca460a91780ac94659df8b4fa080af5d4108b0ef105d59bdd59a52874d1def6bb4e03bad5a4f8979a60e73023d90c3939ac5a8 WHIRLPOOL c13fe81c7f76f7f793f7cc4f4ce78daa30a66c16881d0744d79e5a637df537a2c1049876c6d4ef5d91af1245d26e780e6eb33e090f71c46fefb64383cc48ee8e
-EBUILD kid3-2.0-r1.ebuild 1411 SHA256 b00954194e4f0394e30b51c089242f9050bf9c6fbd73166e996925da71a7864b SHA512 21cc393fea73acffa7fa8e971d53edf782bcf748b3d73245e068dfa15318837126538c8d47b55d1f743f4f191f5319ace3c98188eef06a9bc18f6b8b8c81d38d WHIRLPOOL 2ce42fcf88b3e68e57caf36323fa0fe1e9d63199b616dbc238a8000fafe44ac5178f73e05ae25ef9ada404096f9ff422083d4f9f6adf652687464f77ec5296f5
-MISC ChangeLog 7320 SHA256 baeefa2bd202769498ebdcecc46dbcc227533894e9b86818942d3e0955ac626c SHA512 5243f3903ca073d97ebab64c46751323f852f84916b124ec24ec77e617bbe21cec0272552455034a769d44404e567f677ae35444af6a426482e606f5e42b3be2 WHIRLPOOL c52345a718b35e21a9edba120ac2b3b2a82c8d9a7647745ccd92ea6ad55da6ca821080995439a0f57f6d1a7943f42c058d3a70c56509e8cdaf36bcf190d8f77f
-MISC metadata.xml 179 SHA256 a6cc704b7ee96c5ce8f058d37447ffb4963d319e557b7fd8ff2bc63e5377d030 SHA512 a6decf1ec4b741898241e1ff31a11ff39a81ac9d680cc91a3c5d5c2ae4da94f99b6450f09e139c1ffbd865827b50da0896595af807cccbe83fd2d15ac8d09164 WHIRLPOOL 081c98a8218c74cd1121b546b7652db9b0e33579d1ca669de1209b28ac353c9bea1c1349b1252eaea126b08e98d342a4475d3b2c208a10c0ff0fa3f2d493d26a
diff --git a/media-sound/kid3/files/kid3-1.6-id3form-usability.patch b/media-sound/kid3/files/kid3-1.6-id3form-usability.patch
deleted file mode 100644
index 7702e9b..0000000
--- a/media-sound/kid3/files/kid3-1.6-id3form-usability.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- kid3/id3form.cpp	2010-12-07 20:55:43.000000000 +0100
-+++ kid3/id3form.cpp	2011-04-29 12:41:05.731664449 +0200
-@@ -273,14 +273,14 @@
- 	fileLayout->setMargin(margin);
- 	fileLayout->setSpacing(spacing);
- 
--	m_nameLabel = new QLabel(i18n("Name:"), m_fileWidget);
-+	m_nameLabel = new QLabel(i18n("Filename:"), m_fileWidget);
- 	fileLayout->addWidget(m_nameLabel, 0, 0);
- 
- 	m_nameLineEdit = new QLineEdit(m_fileWidget);
- 	fileLayout->addWidget(m_nameLineEdit, 0, 1, 1, 4);
- 	m_fileLabel->setBuddy(m_nameLineEdit);
- 
--	QLabel* formatLabel = new QLabel(i18n("Format:") + QChar(0x2191),
-+	QLabel* formatLabel = new QLabel(i18n("Set Filename from Tags:"),
- 	                                 m_fileWidget);
- 	fileLayout->addWidget(formatLabel, 1, 0);
- 
-@@ -291,16 +291,12 @@
- 	m_formatComboBox->setToolTip(FrameFormatReplacer::getToolTip());
- 	fileLayout->addWidget(m_formatComboBox, 1, 1);
- 
--	QLabel* fromTagLabel = new QLabel(i18n("From:"), m_fileWidget);
--	fileLayout->addWidget(fromTagLabel, 1, 2);
--	m_fnV1Button = new QPushButton(i18n("Tag 1"), m_fileWidget);
--	m_fnV1Button->setToolTip(i18n("Filename from Tag 1"));
-+	m_fnV1Button = new QPushButton(i18n("from Tag 1"), m_fileWidget);
- 	fileLayout->addWidget(m_fnV1Button, 1, 3);
--	QPushButton* fnV2Button = new QPushButton(i18n("Tag 2"), m_fileWidget);
--	fnV2Button->setToolTip(i18n("Filename from Tag 2"));
-+	QPushButton* fnV2Button = new QPushButton(i18n("from Tag 2"), m_fileWidget);
- 	fileLayout->addWidget(fnV2Button, 1, 4);
- 
--	QLabel* formatFromFilenameLabel = new QLabel(i18n("Format:") + QChar(0x2193),
-+	QLabel* formatFromFilenameLabel = new QLabel(i18n("Set Tags from Filename:"), 
- 	                                             m_fileWidget);
- 	fileLayout->addWidget(formatFromFilenameLabel, 2, 0);
- 
-@@ -314,12 +310,10 @@
- 	QLabel* toTagLabel = new QLabel(i18n("To:"), m_fileWidget);
- 	fileLayout->addWidget(toTagLabel, 2, 2);
- 	m_toTagV1Button =
--		new QPushButton(i18n("Tag 1"), m_fileWidget);
--	m_toTagV1Button->setToolTip(i18n("Tag 1 from Filename"));
-+		new QPushButton(i18n("to Tag 1"), m_fileWidget);
- 	fileLayout->addWidget(m_toTagV1Button, 2, 3);
- 	QPushButton* toTagV2Button =
--		new QPushButton(i18n("Tag 2"), m_fileWidget);
--	toTagV2Button->setToolTip(i18n("Tag 2 from Filename"));
-+		new QPushButton(i18n("to Tag 2"), m_fileWidget);
- 	fileLayout->addWidget(toTagV2Button, 2, 4);
- 
- 	m_tag1Button = new QToolButton(m_rightHalfVBox);
-@@ -452,7 +446,7 @@
- 	fileLayout->addMultiCellWidget(m_nameLineEdit, 0, 0, 1, 4);
- 	m_fileLabel->setBuddy(m_nameLineEdit);
- 
--	QLabel* formatLabel = new QLabel(i18n("Format:") + QChar(0x2191),
-+	QLabel* formatLabel = new QLabel(i18n("Set Filename from Tags:"),
- 	                                 m_fileWidget);
- 	fileLayout->addWidget(formatLabel, 1, 0);
- 
-@@ -466,11 +460,9 @@
- 	QLabel* fromTagLabel = new QLabel(i18n("From:"), m_fileWidget);
- 	fileLayout->addWidget(fromTagLabel, 1, 2);
- 	m_fnV1Button = new QPushButton(i18n("Tag 1"), m_fileWidget);
--	QToolTip::add(m_fnV1Button, i18n("Filename from Tag 1"));
--	fileLayout->addWidget(m_fnV1Button, 1, 3);
-+	fileLayout->addWidget(m_fnV1Button, 1, 2);
- 	QPushButton* fnV2Button = new QPushButton(i18n("Tag 2"), m_fileWidget);
--	QToolTip::add(fnV2Button, i18n("Filename from Tag 2"));
--	fileLayout->addWidget(fnV2Button, 1, 4);
-+	fileLayout->addWidget(fnV2Button, 1, 3);
- 
- 	QLabel* formatFromFilenameLabel = new QLabel(i18n("Format:") + QChar(0x2193),
- 	                                             m_fileWidget);
-@@ -487,12 +479,10 @@
- 	fileLayout->addWidget(toTagLabel, 2, 2);
- 	m_toTagV1Button =
- 		new QPushButton(i18n("Tag 1"), m_fileWidget);
--	QToolTip::add(m_toTagV1Button, i18n("Tag 1 from Filename"));
--	fileLayout->addWidget(m_toTagV1Button, 2, 3);
-+	fileLayout->addWidget(m_toTagV1Button, 2, 2);
- 	QPushButton* toTagV2Button =
- 		new QPushButton(i18n("Tag 2"), m_fileWidget);
--	QToolTip::add(toTagV2Button, i18n("Tag 2 from Filename"));
--	fileLayout->addWidget(toTagV2Button, 2, 4);
-+	fileLayout->addWidget(toTagV2Button, 2, 3);
- 
- 	m_tag1Button = new QToolButton(m_rightHalfVBox);
- 	m_tag1Button->setIconSet(*s_collapsePixmap);
diff --git a/media-sound/kid3/files/kid3-id3form-understandability.patch b/media-sound/kid3/files/kid3-id3form-understandability.patch
deleted file mode 100644
index 5a02578..0000000
--- a/media-sound/kid3/files/kid3-id3form-understandability.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- kid3/id3form.cpp	2010-11-12 16:17:37.000000000 +0000
-+++ kid3/id3form.cpp	2010-11-09 20:28:58.000000000 +0000
-@@ -276 +276 @@
--	m_nameLabel = new QLabel(i18n("Name:"), m_fileWidget);
-+	m_nameLabel = new QLabel(i18n("Filename:"), m_fileWidget);
-@@ -283 +283 @@
--	QLabel* formatLabel = new QLabel(i18n("Format:") + QChar(0x2191),
-+	QLabel* formatLabel = new QLabel(i18n("Set Filename from Tags:"),
-@@ -294,3 +294 @@
--	QLabel* fromTagLabel = new QLabel(i18n("From:"), m_fileWidget);
--	fileLayout->addWidget(fromTagLabel, 1, 2);
--	m_fnV1Button = new QPushButton(i18n("Tag 1"), m_fileWidget);
-+	m_fnV1Button = new QPushButton(i18n("from Tag 1"), m_fileWidget);
-@@ -298 +296 @@
--	QPushButton* fnV2Button = new QPushButton(i18n("Tag 2"), m_fileWidget);
-+	QPushButton* fnV2Button = new QPushButton(i18n("from Tag 2"), m_fileWidget);
-@@ -301 +299 @@
--	QLabel* formatFromFilenameLabel = new QLabel(i18n("Format:") + QChar(0x2193),
-+	QLabel* formatFromFilenameLabel = new QLabel(i18n("Set Tags from Filename:"), 
-@@ -312,2 +309,0 @@
--	QLabel* toTagLabel = new QLabel(i18n("To:"), m_fileWidget);
--	fileLayout->addWidget(toTagLabel, 2, 2);
-@@ -315 +311 @@
--		new QPushButton(i18n("Tag 1"), m_fileWidget);
-+		new QPushButton(i18n("to Tag 1"), m_fileWidget);
-@@ -318 +314 @@
--		new QPushButton(i18n("Tag 2"), m_fileWidget);
-+		new QPushButton(i18n("to Tag 2"), m_fileWidget);
-@@ -451 +447 @@
--	QLabel* formatLabel = new QLabel(i18n("Format:") + QChar(0x2191),
-+	QLabel* formatLabel = new QLabel(i18n("Set Filename from Tags:"),
-@@ -462,2 +457,0 @@
--	QLabel* fromTagLabel = new QLabel(i18n("From:"), m_fileWidget);
--	fileLayout->addWidget(fromTagLabel, 1, 2);
-@@ -465 +459 @@
--	fileLayout->addWidget(m_fnV1Button, 1, 3);
-+	fileLayout->addWidget(m_fnV1Button, 1, 2);
-@@ -467 +461 @@
--	fileLayout->addWidget(fnV2Button, 1, 4);
-+	fileLayout->addWidget(fnV2Button, 1, 3);
-@@ -480,2 +473,0 @@
--	QLabel* toTagLabel = new QLabel(i18n("To:"), m_fileWidget);
--	fileLayout->addWidget(toTagLabel, 2, 2);
-@@ -484 +476 @@
--	fileLayout->addWidget(m_toTagV1Button, 2, 3);
-+	fileLayout->addWidget(m_toTagV1Button, 2, 2);
-@@ -487 +479 @@
--	fileLayout->addWidget(toTagV2Button, 2, 4);
-+	fileLayout->addWidget(toTagV2Button, 2, 3);
diff --git a/media-sound/kid3/kid3-1.6-r1.ebuild b/media-sound/kid3/kid3-1.6-r1.ebuild
deleted file mode 100644
index 05aae49..0000000
--- a/media-sound/kid3/kid3-1.6-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kid3/kid3-1.6.ebuild,v 1.2 2011/04/24 15:27:28 scarabeus Exp $
-
-EAPI=4
-KDE_LINGUAS="cs de es et fi fr it nl pl ru tr zh_TW"
-KDE_REQUIRED="always"
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="A simple tag editor for KDE"
-HOMEPAGE="http://kid3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kid3/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="flac mp3 mp4 musicbrainz +taglib vorbis"
-
-RDEPEND="
-	flac? (
-		media-libs/flac[cxx]
-		media-libs/libvorbis
-	)
-	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2 )
-	musicbrainz? ( media-libs/musicbrainz:3
-		media-libs/tunepimp )
-	taglib? ( media-libs/taglib )
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="flac? ( vorbis )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/kid3-1.6-id3form-usability.patch || die
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	# -DWITH_TUNEPIMP works, but uses the MBz RDF WebService which is deprecated
-	# Details: http://musicbrainz.org/doc/Web_Service
-	# Upstream bug report:
-	# http://sourceforge.net/tracker/?func=detail&aid=3216188&group_id=70849&atid=529221
-
-	local mycmakeargs=(
-		$(cmake-utils_use_with flac)
-		$(cmake-utils_use_with mp3 ID3LIB)
-		$(cmake-utils_use_with mp4 MP4V2)
-		$(cmake-utils_use_with musicbrainz TUNEPIMP)
-		$(cmake-utils_use_with vorbis)
-		$(cmake-utils_use_with taglib)
-		"-DWITH_KDE=ON"
-		)
-
-	kde4-base_src_configure
-}
diff --git a/media-sound/kid3/kid3-2.0-r1.ebuild b/media-sound/kid3/kid3-2.0-r1.ebuild
deleted file mode 100644
index 8e231b3..0000000
--- a/media-sound/kid3/kid3-2.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-KDE_LINGUAS="cs de es et fi fr it nl pl ru tr zh_TW"
-KDE_REQUIRED="optional"
-KDE_HANDBOOK="optional"
-inherit kde4-base
-
-DESCRIPTION="A simple tag editor for KDE"
-HOMEPAGE="http://kid3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/kid3/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="flac kde mp3 mp4 musicbrainz +taglib vorbis"
-
-RDEPEND="
-	flac? (
-		media-libs/flac[cxx]
-		media-libs/libvorbis
-	)
-	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2 )
-	musicbrainz? ( media-libs/musicbrainz:3
-		media-libs/tunepimp )
-	taglib? ( media-libs/taglib )
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="flac? ( vorbis )"
-
-src_prepare() {
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	# -DWITH_TUNEPIMP works, but uses the MBz RDF WebService which is deprecated
-	# Details: http://musicbrainz.org/doc/Web_Service
-	# Upstream bug report:
-	# http://sourceforge.net/tracker/?func=detail&aid=3216188&group_id=70849&atid=529221
-
-	local mycmakeargs=(
-		$(cmake-utils_use_with flac)
-		$(cmake-utils_use_with mp3 ID3LIB)
-		$(cmake-utils_use_with kde)
-		$(cmake-utils_use_with mp4 MP4V2)
-		$(cmake-utils_use_with musicbrainz TUNEPIMP)
-		$(cmake-utils_use_with vorbis)
-		$(cmake-utils_use_with taglib)
-	)
-
-	kde4-base_src_configure
-}
diff --git a/media-sound/kid3/metadata.xml b/media-sound/kid3/metadata.xml
deleted file mode 100644
index c19e8bd..0000000
--- a/media-sound/kid3/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>kde</herd>
-  <herd>sound</herd>
-</pkgmetadata>
diff --git a/metadata/layout.conf b/metadata/layout.conf
new file mode 100644
index 0000000..d43e61c
--- /dev/null
+++ b/metadata/layout.conf
@@ -0,0 +1 @@
+masters = gentoo
diff --git a/net-misc/plowshare/Manifest b/net-misc/plowshare/Manifest
index d852c70..ce8c103 100644
--- a/net-misc/plowshare/Manifest
+++ b/net-misc/plowshare/Manifest
@@ -1,2 +1,2 @@
-EBUILD plowshare-99999999.ebuild 2862 SHA256 fd09b1aac385e8cccd8fb8be66a20c9e355b53bcdbdc2e88d5c6617bb656de16 SHA512 bbbe5caa2f960bf6a7ead101db67245193bc72eaab320fddc9fe5880942afbf91eb5f6331ada447f286a8d863e846347fa0164e1f8fdbc323bc281a7ec06ca55 WHIRLPOOL 73f87a50b162b366249910e87ed4e6abf4aa5b996436ebf0dfaaaf1dafc14fa4a0ea63aa5f2916a0fe46ea74f3195fdffc9fd9bdef95b1d2b8730461a7731ad1
+EBUILD plowshare-99999999.ebuild 2061 SHA256 131d296ee657513ab6568006b99855a66ed734cda57a8b54ff0234bf7f8c0bb6 SHA512 41daeed91fb0e288cc492640f93ffc5f998fa46bc6e9b433303875f281afe87c376000113d7c15e93045816e194b0b18526e50d75c6f6a8a6569d1785491b184 WHIRLPOOL aafbdf16f77aecbc05c54fbf7f96a033ae96f306a496f733599432f77ba6f37523b78b653e78f9089137c901c6dd1c9171ab1d80dd6ac725d1946d4f83399810
 MISC metadata.xml 436 SHA256 570ee354fd5582f16fb1b090baeb3d85faf43f4aaa542a47219813960fa3c073 SHA512 b54e1fe96ed5dfcc9198c02784d16c5994dfc048aa898dc391afec983fce720b852d4780c583a106fe13cc02582bc58b1659cbc84848b3605a814351c4289c3b WHIRLPOOL c964575c08009e35165b542cc671e29db56c1bc295830172beb9ec141f2283e287e50fc2e584c26945b87f1a2d0d982651496ed095fe49e5ed52d276ae7ddd3e
diff --git a/net-misc/plowshare/plowshare-99999999.ebuild b/net-misc/plowshare/plowshare-99999999.ebuild
index 798196b..928510e 100644
--- a/net-misc/plowshare/plowshare-99999999.ebuild
+++ b/net-misc/plowshare/plowshare-99999999.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: $
 
-EAPI="2"
+EAPI=5
 
 inherit bash-completion-r1 git-2
 
@@ -12,49 +12,33 @@ EGIT_REPO_URI="https://code.google.com/p/${PN}/"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="bash-completion +javascript +perl scripts view-captcha"
+KEYWORDS=""
+IUSE="bash-completion +javascript scripts view-captcha"
 
 RDEPEND="
-	javascript? ( dev-lang/spidermonkey )
-	perl? ( dev-lang/perl
-		media-gfx/imagemagick[perl] )
-	view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )
-	app-shells/bash
+	>=app-shells/bash-4
 	|| ( app-text/recode ( dev-lang/perl dev-perl/HTML-Parser ) )
-	app-text/tesseract[tiff]
 	|| ( media-gfx/imagemagick[tiff] media-gfx/graphicsmagick[imagemagick,tiff] )
 	net-misc/curl
-	sys-apps/util-linux"
+	sys-apps/util-linux
+	javascript? ( || ( dev-lang/spidermonkey:0 dev-java/rhino ) )
+	view-captcha? ( || ( media-gfx/aview media-libs/libcaca ) )"
 DEPEND=""
 
+S=${WORKDIR}/${MY_P}
+
 # NOTES:
-# spidermonkey dep should be any javascript interpreter using /usr/bin/js
+# javascript dep should be any javascript interpreter using /usr/bin/js
 
-# TODO:
-# dev-java/rhino could probably be an alternative for spidermonkey
+# Modules using detect_javascript
+JS_MODULES="letitbit rapidgator zalaa zippyshare"
 
 src_prepare() {
 	if ! use javascript; then
-		sed -i -e 's:^mediafire.*::' \
-			-e 's:^badongo.*::' \
-			-e 's:^dataport_cz.*::' \
-			-e 's:^1fichier.*::' \
-			-e 's:^turbobit.*::' \
-			src/modules/config || die "sed failed"
-		rm src/modules/{mediafire,badongo,dataport_cz,1fichier,turbobit}.sh || die "rm failed"
-	fi
-	if ! use perl; then
-		sed -i -e 's:^netload_in.*::' \
-			-e 's:^badongo.*::' \
-			src/modules/config || die "sed failed"
-		rm src/modules/netload_in.sh || die "rm failed"
-		if use javascript; then
-			rm src/modules/badongo.sh || die "rm failed"
-		fi
-
-		# Don't install perl file helpers.
-		sed -i -e 's:\(.*src/core.sh\).*:\1:' Makefile || die "sed failed"
+		for module in ${JS_MODULES}; do
+			sed -i -e "s:^${module}.*::" src/modules/config || die "${module} sed failed"
+			rm src/modules/${module}.sh || die "${module} rm failed"
+		done
 	fi
 
 	# Don't let 'make install' install docs.
@@ -62,7 +46,7 @@ src_prepare() {
 
 	if use bash-completion; then
 		sed -i -e \
-			's:CDIR=/usr/local/share/plowshare/modules/config:CDIR=/usr/share/plowshare/modules/config:' \
+			"s,/usr/local\(/share/plowshare4/modules/config\),${EPREFIX}/usr\1," \
 			etc/plowshare.completion || die "sed failed"
 	fi
 }
@@ -78,28 +62,23 @@ src_test() {
 }
 
 src_install() {
-	DESTDIR="${D}" PREFIX="/usr" emake install || die "emake install failed"
+	emake DESTDIR="${D}" PREFIX="/usr" install
 
-	dodoc AUTHORS CHANGELOG README || die "dodoc failed"
+	dodoc AUTHORS README
 
 	if use scripts; then
 		exeinto /usr/bin/
-		doexe ${S}/contrib/plowdown_{add_remote_loop,loop,parallel}.sh \
-			|| die "doins failed"
+		doexe contrib/{plowdown_{add_remote_loop,loop,parallel}}.sh
 	fi
 
 	if use bash-completion; then
-		newbashcomp etc/${PN}.completion ${PN} || die "newbashcomp failed"
+		newbashcomp etc/${PN}.completion ${PN}
 	fi
 }
 
 pkg_postinst() {
 	if ! use javascript; then
 		ewarn "Without javascript you will not be able to use:"
-		ewarn " mediafire, badongo, dataport_cz, 1fichier and turbobit."
-	fi
-	if ! use perl; then
-		ewarn "Without perl you will not be able to use:"
-		ewarn " netload.in and badongo."
+		ewarn " ${JS_MODULES}"
 	fi
 }