5 files changed, 85 insertions, 15 deletions
diff --git a/media-gfx/skencil/ChangeLog b/media-gfx/skencil/ChangeLog
index 7e89b364fde6..99fd30d67f5f 100644
--- a/media-gfx/skencil/ChangeLog
+++ b/media-gfx/skencil/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/skencil
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/skencil/ChangeLog,v 1.29 2007/05/09 05:07:05 hanno Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/skencil/ChangeLog,v 1.30 2008/05/19 00:21:18 hanno Exp $
+
+*skencil-0.6.18_pre20080519 (19 May 2008)
+
+  19 May 2008; Hanno Boeck <hanno@gentoo.org>
+  +files/skencil-0.6.17-setup.py.patch, +skencil-0.6.18_pre20080519.ebuild:
+  Bump, fix building with tcl/tk 8.5, fix another build error.
 
   09 May 2007; Hanno Boeck <hanno@gentoo.org>
   +files/skencil-configure-without-nls.diff,
diff --git a/media-gfx/skencil/files/skencil-0.6.17-setup.py.patch b/media-gfx/skencil/files/skencil-0.6.17-setup.py.patch
new file mode 100644
index 000000000000..ca0bafd02e86
--- /dev/null
+++ b/media-gfx/skencil/files/skencil-0.6.17-setup.py.patch
@@ -0,0 +1,11 @@
+--- setup.py.orig+	2007-12-27 23:40:59.000000000 +0100
++++ setup.py	2007-12-27 23:41:40.000000000 +0100
+@@ -255,7 +255,7 @@ def configure_tkinter(configs, flags):
+     # possible version suffixes.  Some systems use dots in the suffixes
+     # (e.g. debian), some don't (e.g. OpenBSD) so we try both.
+     versions = []
+-    for version in ["8.4", "8.3", "8.2", "8.1", "8.0"]:
++    for version in ["8.5", "8.4", "8.3", "8.2", "8.1", "8.0"]:
+         versions.append(version)
+         versions.append(version[0] + version[-1])
+ 
diff --git a/media-gfx/skencil/skencil-0.6.17.ebuild b/media-gfx/skencil/skencil-0.6.17.ebuild
index 82c036452e31..e5d1ab3054e3 100644
--- a/media-gfx/skencil/skencil-0.6.17.ebuild
+++ b/media-gfx/skencil/skencil-0.6.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.17.ebuild,v 1.11 2007/02/05 20:22:35 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/skencil/skencil-0.6.17.ebuild,v 1.12 2008/05/19 00:21:18 hanno Exp $
 
 inherit python multilib
 
@@ -28,9 +28,9 @@ src_unpack() {
 	if [ $(get_libdir) != "lib" ] ; then
 		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"
+			"${S}"/{Pax,Filter,Sketch/Modules}/Makefile.pre.in \
+			"${S}"/Plugins/Objects/Lib/multilinetext/{TextEditor,styletext}.py \
+			"${S}"/setup.py || die "sed failed"
 	fi
 }
 
@@ -41,7 +41,7 @@ src_compile() {
 }
 
 src_install () {
-	./setup.py install --prefix=/usr --dest-dir=${D}
+	./setup.py install --prefix=/usr --dest-dir="${D}"
 	assert "setup.py install failed"
 
 	newdoc Pax/README README.pax
diff --git a/media-gfx/skencil/skencil-0.6.18_pre20070421.ebuild b/media-gfx/skencil/skencil-0.6.18_pre20070421.ebuild
index 30623c123181..b037e1f2cccc 100644
--- a/media-gfx/skencil/skencil-0.6.18_pre20070421.ebuild
+++ b/media-gfx/skencil/skencil-0.6.18_pre20070421.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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_pre20070421.ebuild,v 1.3 2007/05/09 05:07:05 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/skencil/skencil-0.6.18_pre20070421.ebuild,v 1.4 2008/05/19 00:21:18 hanno Exp $
 
 inherit python multilib eutils
 
@@ -25,15 +25,15 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/skencil-configure-without-nls.diff
+	cd "${S}"
+	epatch "${FILESDIR}/skencil-configure-without-nls.diff"
 
 	# 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"
+		"${S}"/{Pax,Filter,Sketch/Modules}/Makefile.pre.in \
+		"${S}"/Plugins/Objects/Lib/multilinetext/{TextEditor,styletext}.py \
+		"${S}"/setup.py || die "sed failed"
 }
 
 src_compile() {
diff --git a/media-gfx/skencil/skencil-0.6.18_pre20080519.ebuild b/media-gfx/skencil/skencil-0.6.18_pre20080519.ebuild
new file mode 100644
index 000000000000..5ea9412e8d03
--- /dev/null
+++ b/media-gfx/skencil/skencil-0.6.18_pre20080519.ebuild
@@ -0,0 +1,53 @@
+# 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.1 2008/05/19 00:21:18 hanno Exp $
+
+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-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"
+
+pkg_setup() {
+	python_tkinter_exists
+}
+
+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
+}