10 files changed, 21 insertions, 222 deletions
diff --git a/app-text/wklej/ChangeLog b/app-text/wklej/ChangeLog
index 19dc9fe70779..93f81bdf3e1a 100644
--- a/app-text/wklej/ChangeLog
+++ b/app-text/wklej/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/wklej
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wklej/ChangeLog,v 1.23 2010/06/29 16:47:03 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wklej/ChangeLog,v 1.24 2010/10/01 15:47:27 scarabeus Exp $
+
+  01 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org> -wklej-0.1.1.ebuild,
+  -wklej-0.1.2.ebuild, -wklej-0.1.3.ebuild, -wklej-0.1.4.ebuild,
+  -wklej-0.1.5.ebuild, -wklej-0.1.5-r1.ebuild, -wklej-0.1.6.ebuild,
+  -wklej-0.1.7.ebuild, wklej-0.2.0.ebuild:
+  Cleanup latest to use python eclass for depend. Stabilize latest on amd64
+  and x86. Remove old that didn't work.
 
 *wklej-0.2.0 (29 Jun 2010)
 
diff --git a/app-text/wklej/wklej-0.1.1.ebuild b/app-text/wklej/wklej-0.1.1.ebuild
deleted file mode 100644
index 9991d4c65181..000000000000
--- a/app-text/wklej/wklej-0.1.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wklej/wklej-0.1.1.ebuild,v 1.1 2008/08/20 18:51:57 cla Exp $
-
-DESCRIPTION="A wklej.org submitter"
-HOMEPAGE="http://wklej.org"
-SRC_URI="http://wklej.org/m/apps/wklej-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="${RDEPEND}"
-RDEPEND="dev-lang/python"
-
-src_install() {
-	dobin "${WORKDIR}"/${P}.py
-	dosym ${P}.py /usr/bin/${PN}
-}
diff --git a/app-text/wklej/wklej-0.1.2.ebuild b/app-text/wklej/wklej-0.1.2.ebuild
deleted file mode 100644
index 45c86d3ee716..000000000000
--- a/app-text/wklej/wklej-0.1.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wklej/wklej-0.1.2.ebuild,v 1.1 2008/08/22 13:46:46 cla Exp $
-
-DESCRIPTION="A wklej.org submitter"
-HOMEPAGE="http://wklej.org"
-SRC_URI="http://wklej.org/m/apps/wklej-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="${RDEPEND}"
-RDEPEND="dev-lang/python"
-
-src_install() {
-	dobin "${WORKDIR}"/${P}.py
-	dosym ${P}.py /usr/bin/${PN}
-}
diff --git a/app-text/wklej/wklej-0.1.3.ebuild b/app-text/wklej/wklej-0.1.3.ebuild
deleted file mode 100644
index 13b6e71311a8..000000000000
--- a/app-text/wklej/wklej-0.1.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wklej/wklej-0.1.3.ebuild,v 1.3 2008/10/01 22:34:27 cla Exp $
-
-DESCRIPTION="A wklej.org submitter"
-HOMEPAGE="http://wklej.org"
-SRC_URI="http://wklej.org/m/apps/wklej-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="${RDEPEND}"
-RDEPEND="dev-lang/python"
-
-src_install() {
-	dobin "${WORKDIR}"/${P}.py
-	dosym ${P}.py /usr/bin/${PN}
-}
diff --git a/app-text/wklej/wklej-0.1.4.ebuild b/app-text/wklej/wklej-0.1.4.ebuild
deleted file mode 100644
index 1910e403015c..000000000000
--- a/app-text/wklej/wklej-0.1.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wklej/wklej-0.1.4.ebuild,v 1.1 2008/09/29 21:46:56 cla Exp $
-
-DESCRIPTION="A wklej.org submitter"
-HOMEPAGE="http://wklej.org"
-SRC_URI="http://wklej.org/m/apps/wklej-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="${RDEPEND}"
-RDEPEND="dev-lang/python"
-
-src_install() {
-	dobin "${WORKDIR}"/${P}.py
-	dosym ${P}.py /usr/bin/${PN}
-}
diff --git a/app-text/wklej/wklej-0.1.5-r1.ebuild b/app-text/wklej/wklej-0.1.5-r1.ebuild
deleted file mode 100644
index 1da6abeb3cce..000000000000
--- a/app-text/wklej/wklej-0.1.5-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wklej/wklej-0.1.5-r1.ebuild,v 1.1 2008/11/23 16:12:37 cla Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="A wklej.org submitter"
-HOMEPAGE="http://wklej.org"
-SRC_URI="http://wklej.org/m/apps/wklej-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="+vim"
-
-DEPEND="${RDEPEND}"
-RDEPEND="dev-lang/python
-	vim? ( app-editors/vim[python] )"
-
-src_install() {
-	if use vim; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins "${WORKDIR}"/${PN}.vim
-	fi
-
-	dobin "${WORKDIR}"/${PN}
-}
diff --git a/app-text/wklej/wklej-0.1.5.ebuild b/app-text/wklej/wklej-0.1.5.ebuild
deleted file mode 100644
index 3df336fa635b..000000000000
--- a/app-text/wklej/wklej-0.1.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wklej/wklej-0.1.5.ebuild,v 1.3 2009/03/07 14:34:55 gentoofan23 Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="A wklej.org submitter"
-HOMEPAGE="http://wklej.org"
-SRC_URI="http://wklej.org/m/apps/wklej-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="+vim"
-
-DEPEND="${RDEPEND}"
-RDEPEND="dev-lang/python
-	vim? ( app-editors/vim[python] )"
-
-src_install() {
-	if use vim; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins "${WORKDIR}"/${PN}.vim
-	fi
-
-	dobin "${WORKDIR}"/${PN}
-}
diff --git a/app-text/wklej/wklej-0.1.6.ebuild b/app-text/wklej/wklej-0.1.6.ebuild
deleted file mode 100644
index 1cdf257e6a7f..000000000000
--- a/app-text/wklej/wklej-0.1.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wklej/wklej-0.1.6.ebuild,v 1.5 2009/05/30 09:50:15 gentoofan23 Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="A wklej.org submitter"
-HOMEPAGE="http://wklej.org"
-SRC_URI="http://wklej.org/m/apps/wklej-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="+vim"
-
-DEPEND="${RDEPEND}"
-RDEPEND="dev-lang/python
-	vim? ( app-editors/vim[python] )"
-
-src_install() {
-	if use vim; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins "${WORKDIR}"/${PN}.vim
-	fi
-
-	dobin "${WORKDIR}"/${PN}
-	dodoc "${FILESDIR}"/wklejrc.txt
-
-	elog "A new feature was added since version ${PV}"
-	elog "Now you can use ~/.wklejrc which allows you to pastebin as"
-	elog "an authorized user."
-	elog "Go to http://wklej.org/salt to get your SALT_KEY."
-}
diff --git a/app-text/wklej/wklej-0.1.7.ebuild b/app-text/wklej/wklej-0.1.7.ebuild
deleted file mode 100644
index 18cfeb764797..000000000000
--- a/app-text/wklej/wklej-0.1.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wklej/wklej-0.1.7.ebuild,v 1.4 2010/05/21 19:00:53 pacho Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="A wklej.org submitter"
-HOMEPAGE="http://wklej.org"
-SRC_URI="http://wklej.org/m/apps/wklej-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="+vim"
-
-DEPEND="${RDEPEND}"
-RDEPEND="dev-lang/python
-	vim? ( app-editors/vim[python] )"
-
-src_install() {
-	if use vim; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins "${WORKDIR}"/${PN}.vim || die
-	fi
-
-	dobin "${WORKDIR}"/${PN} || die
-	dodoc "${WORKDIR}"/README || die
-
-	elog "A new feature was added since version 0.1.6"
-	elog "Now you can use ~/.wklejrc which allows you to pastebin as"
-	elog "an authorized user."
-	elog "Check out the README file in /usr/share/doc/${PN}-${PV}/README"
-}
diff --git a/app-text/wklej/wklej-0.2.0.ebuild b/app-text/wklej/wklej-0.2.0.ebuild
index f62451264c78..74bf45ba22cb 100644
--- a/app-text/wklej/wklej-0.2.0.ebuild
+++ b/app-text/wklej/wklej-0.2.0.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wklej/wklej-0.2.0.ebuild,v 1.1 2010/06/29 16:47:03 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wklej/wklej-0.2.0.ebuild,v 1.2 2010/10/01 15:47:27 scarabeus Exp $
 
-EAPI=2
+EAPI=3
 
-inherit eutils
+PYTHON_DEPEND="*:2.6"
+inherit eutils python
 
 DESCRIPTION="A wklej.org submitter"
 HOMEPAGE="http://wklej.org"
@@ -12,26 +13,25 @@ SRC_URI="http://wklej.org/m/apps/wklej-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 x86 x86-fbsd"
 IUSE="+vim"
 
-DEPEND="${RDEPEND}"
-RDEPEND="dev-lang/python
-	vim? ( app-editors/vim[python] )"
+DEPEND=""
+RDEPEND="vim? ( app-editors/vim[python] )"
+
+S=${WORKDIR}
 
 src_install() {
 	if use vim; then
 		insinto /usr/share/vim/vimfiles/plugin
-		doins "${WORKDIR}"/${PN}.vim || die "Failed to install vim plugin"
+		doins ${PN}.vim || die "Failed to install vim plugin"
 	fi
 
-	dobin "${WORKDIR}"/${PN} || die "Failed to install ${PN} script"
-	dodoc "${WORKDIR}"/README || die "Failed to install readme"
-	dodoc "${WORKDIR}"/wklejrc || die "Failed to install wklejrc"
+	dobin ${PN} || die "Failed to install ${PN} script"
+	dodoc README wklejrc || die "Failed to install readme"
 }
 
 pkg_postinst() {
 	elog "There are lots of changes in ${PV} version"
-	elog "Check out the README file in /usr/share/doc/${P}/README.bz2"
-	elog "Example of .wklejrc file /usr/share/doc/${P}/wklejrc.bz2"
+	elog "Check out the documents in /usr/share/doc/${PF}"
 }