12 files changed, 193 insertions, 135 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-office/gscan2pdf/Manifest b/app-office/gscan2pdf/Manifest
index 8e97e6f..ca5f72d 100644
--- a/app-office/gscan2pdf/Manifest
+++ b/app-office/gscan2pdf/Manifest
@@ -1,3 +1,6 @@
 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
+<<<<<<< HEAD
+=======
 MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
+>>>>>>> 128e0df7d8d45773efea3a26acb5d1a762b7a8d2
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..f7f5186 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,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+<<<<<<< HEAD
+EAPI=5
+=======
 EAPI=4
+>>>>>>> 128e0df7d8d45773efea3a26acb5d1a762b7a8d2
 
 MODULE_AUTHOR="RHANDOM"
 MODULE_VERSION="2.03"
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/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..970489c 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 2055 SHA256 ca657c0cb8171f55ace9707c8748c522d26100a3716ed975bac376acab02a98c SHA512 cffd2ab4b33acad3d513b242191455de88c320ca53a87164ad0ef1efcb0231cde995d44bf906760fbe80de6eda286bc7e14d3c92d87e605a4536cf88a22d7bfc WHIRLPOOL f149678a79fc515a1a7e161fbc74d9fae6a4daa77eb9942af889995302c972fd881e540402aa162c7d95bb8bfd94237ee76d15be1f5960173701185c67f975d8
 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..b737efd 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
 
@@ -13,48 +13,29 @@ 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"
+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=""
 
 # NOTES:
-# spidermonkey dep should be any javascript interpreter using /usr/bin/js
-
-# TODO:
-# dev-java/rhino could probably be an alternative for spidermonkey
+# javascript dep should be any javascript interpreter using /usr/bin/js
 
 src_prepare() {
+	# Modules using detect_javascript
 	if ! use javascript; then
-		sed -i -e 's:^mediafire.*::' \
-			-e 's:^badongo.*::' \
-			-e 's:^dataport_cz.*::' \
-			-e 's:^1fichier.*::' \
-			-e 's:^turbobit.*::' \
+		sed -i -e 's:^rapidgator.*::' \
+			-e 's:^zalaa*::' \
+			-e 's:^zippyshare*::' \
 			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"
+		rm src/modules/{rapidgator,zalaa,zippyshare}.sh || die "rm failed"
 	fi
 
 	# Don't let 'make install' install docs.
@@ -62,7 +43,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 +59,25 @@ 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"
+		pwd
+		ls contrib
+		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 " rapidgator, zalaa, zippyshare"
 	fi
 }