skencil: accidently added a stable EAPI=2 ebuild, restored the old one and added the new eapi stuff in an -r1

ebuild
Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.28-rc5 x86_64

4 files changed, 72 insertions, 11 deletions

diff --git a/media-gfx/skencil/ChangeLog b/media-gfx/skencil/ChangeLog
index 1ccefeb7bc83..2031fcf1ce5e 100644
--- a/media-gfx/skencil/ChangeLog
+++ b/media-gfx/skencil/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/skencil
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/skencil/ChangeLog,v 1.37 2008/11/16 23:27:17 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/skencil/ChangeLog,v 1.38 2008/11/21 12:32:58 hanno Exp $
+
+*skencil-0.6.18_pre20080519-r1 (21 Nov 2008)
+
+  21 Nov 2008; Hanno Boeck <hanno@gentoo.org>
+  skencil-0.6.18_pre20080519.ebuild, +skencil-0.6.18_pre20080519-r1.ebuild:
+  Restore ebuild without EAPI=2, add new, unstable-keyworded one with EAPI=2
+  features.
 
   16 Nov 2008; Hanno Boeck <hanno@gentoo.org>
   skencil-0.6.18_pre20080519.ebuild:
diff --git a/media-gfx/skencil/Manifest b/media-gfx/skencil/Manifest
index 6ce999e2b3a3..7061104c1cbf 100644
--- a/media-gfx/skencil/Manifest
+++ b/media-gfx/skencil/Manifest
@@ -4,13 +4,14 @@ Hash: SHA1
 AUX skencil-0.6.17-setup.py.patch 527 RMD160 8c94fbf0a686aed976a4dbfcb256525f59d69d6e SHA1 823cb9a4535853d01172d585635b435748c48860 SHA256 16f25b63b8fc065803bc754b5356b3c5ffd1b8c9a1e9eeff203d1448c422263e
 AUX skencil-configure-without-nls.diff 481 RMD160 8c00a80aaa7cbf988d0332328a4a5f9bc6a57c84 SHA1 5fb209670bc4aa5c4284c185ce3d1ff0ee1fa552 SHA256 e287c3bcfba196d4f20bd6ce0dd8253db17b5090ad40309a7dbf728983190d46
 DIST skencil-0.6.18_pre20080519.tar.bz2 858436 RMD160 883fd77ded659bb0e2b2ca46e9ac3aa338cea8d0 SHA1 3a481824919d0a730ba5705a2cef92c6cfc8b737 SHA256 493bd7c3ec9d80542f4d926497ca31aceb9a9dede7989332cee0539f417a7d53
-EBUILD skencil-0.6.18_pre20080519.ebuild 1475 RMD160 f75eb0db915c2af40683f01491166d81f8c145d1 SHA1 7eea81e2ede718f9c97bdb7e94f011a0d1f902a5 SHA256 7b8d805955e6be53ca97a461eacd4200f660289ed7ce1c1e2c2e48d778b31843
-MISC ChangeLog 4660 RMD160 b61c4df1d5e0f8ed6bbb5c942c80dca2cfe26103 SHA1 e195ef47ee973457a040b66e03969cf7f548bb44 SHA256 fe2af2b9ef263283bb4db4b999ec5a7f00ce249c2c47386bfc7d01eef0691224
+EBUILD skencil-0.6.18_pre20080519-r1.ebuild 1484 RMD160 b3bacc05dd248a9857b98f933081f5ffd545bc9a SHA1 f4937530cd6b6c03c04e791d974480092cfe489f SHA256 fa7573d79c016ee4171479eb67638a99f3c7d1cbfc6dc59e6abf63fa5d4912a5
+EBUILD skencil-0.6.18_pre20080519.ebuild 1486 RMD160 f9bd8c33d98f10feff1f737af38e807a18afdf97 SHA1 f75044d39b44a109fbc5b9ef8424a883670b9ba1 SHA256 0efaaaf5f056674ee48cf525469c4db9501ff4eab9aa91cd1450f4c96772bfd4
+MISC ChangeLog 4918 RMD160 d0434fa4001908e7bece1ee8757c41159d561512 SHA1 20341ac385a3329114a97688312e46de86085900 SHA256 1a5cbbfdaa54d7046476b53d1f622d5c141a90a4a2c7489ace05c152728c7d73
 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkgrE8ACgkQr2QksT29OyCBXQCggCwtLMdLHyj90vk5+tcyOxWF
-BEQAniY7QZa7gpa2KAIeJap0kfk24xkE
-=5KzE
+iEYEARECAAYFAkkmqmcACgkQr2QksT29OyCObgCfc16Kk6gUahxWWld6XNnpSA6O
+FNUAnRp45c/75FSWatSDH/UcUV6ov5w+
+=DVGW
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/skencil/skencil-0.6.18_pre20080519-r1.ebuild b/media-gfx/skencil/skencil-0.6.18_pre20080519-r1.ebuild
new file mode 100644
index 000000000000..005b6e1b874e
--- /dev/null
+++ b/media-gfx/skencil/skencil-0.6.18_pre20080519-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/skencil/skencil-0.6.18_pre20080519-r1.ebuild,v 1.1 2008/11/21 12:32:58 hanno Exp $
+
+EAPI=2
+
+inherit python multilib eutils
+
+IUSE="nls"
+S=${WORKDIR}/${PN}-0.6
+DESCRIPTION="Interactive X11 vector drawing program"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+HOMEPAGE="http://www.skencil.org/"
+DEPEND="dev-lang/python[tk]
+	>=dev-python/imaging-1.1.2-r1
+	dev-python/reportlab
+	dev-lang/tk
+	nls? ( sys-devel/gettext )"
+RDEPEND="!elibc_glibc? ( nls? ( sys-devel/gettext ) )
+	dev-python/pyxml"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/skencil-configure-without-nls.diff"
+	epatch "${FILESDIR}/skencil-0.6.17-setup.py.patch"
+
+	# Fix hardcoded libdir
+	sed -i -e "s:lib/:$(get_libdir)/:" \
+		-e "s:lib':$(get_libdir)':" \
+		"${S}"/{Pax,Filter,Sketch/Modules}/Makefile.pre.in \
+		"${S}"/Plugins/Objects/Lib/multilinetext/{TextEditor,styletext}.py \
+		"${S}"/setup.py || die "sed failed"
+}
+
+src_compile() {
+	./setup.py configure `use_with nls` || die
+	BLDSHARED='gcc -shared' ./setup.py build || die
+}
+
+src_install () {
+	./setup.py install --prefix=/usr --dest-dir="${D}"
+	assert "setup.py install failed"
+
+	newdoc Pax/README README.pax
+	newdoc Filter/README README.filter
+	dodoc Examples Doc Misc
+	dodoc README INSTALL BUGS CREDITS TODO PROJECTS FAQ NEWS
+}
diff --git a/media-gfx/skencil/skencil-0.6.18_pre20080519.ebuild b/media-gfx/skencil/skencil-0.6.18_pre20080519.ebuild
index 6d467f8fd687..2966ff1b7c0c 100644
--- a/media-gfx/skencil/skencil-0.6.18_pre20080519.ebuild
+++ b/media-gfx/skencil/skencil-0.6.18_pre20080519.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/skencil/skencil-0.6.18_pre20080519.ebuild,v 1.8 2008/11/16 23:27:17 hanno Exp $
-
-EAPI=2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/skencil/skencil-0.6.18_pre20080519.ebuild,v 1.9 2008/11/21 12:32:58 hanno Exp $
 
 inherit python multilib eutils
 
@@ -11,8 +9,7 @@ S=${WORKDIR}/${PN}-0.6
 DESCRIPTION="Interactive X11 vector drawing program"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 HOMEPAGE="http://www.skencil.org/"
-DEPEND="dev-lang/python[tk]
-	>=dev-python/imaging-1.1.2-r1
+DEPEND=">=dev-python/imaging-1.1.2-r1
 	dev-python/reportlab
 	dev-lang/tk
 	nls? ( sys-devel/gettext )"
@@ -22,6 +19,10 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
 
+pkg_setup() {
+	python_tkinter_exists
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"