summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbie Hopkins <herbs@gentoo.org>2005-11-17 23:45:20 +0000
committerHerbie Hopkins <herbs@gentoo.org>2005-11-17 23:45:20 +0000
commit557b1965ca17f7b9009d38151123208eff2a7ade (patch)
treee783bf325f08735e35a4bb4a4bb7fbfd782c7ace /media-gfx/skencil
parentremoved most sed lines in favor of patching makefiles (diff)
downloadgentoo-2-557b1965ca17f7b9009d38151123208eff2a7ade.tar.gz
gentoo-2-557b1965ca17f7b9009d38151123208eff2a7ade.tar.bz2
gentoo-2-557b1965ca17f7b9009d38151123208eff2a7ade.zip
Fixed multilib-strict issue, bug 98622. Re-add dropped ~amd64 keyword.
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'media-gfx/skencil')
-rw-r--r--media-gfx/skencil/ChangeLog5
-rw-r--r--media-gfx/skencil/Manifest22
-rw-r--r--media-gfx/skencil/skencil-0.6.17.ebuild18
3 files changed, 25 insertions, 20 deletions
diff --git a/media-gfx/skencil/ChangeLog b/media-gfx/skencil/ChangeLog
index 222a0f96149e..19d395625173 100644
--- a/media-gfx/skencil/ChangeLog
+++ b/media-gfx/skencil/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-gfx/skencil
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/skencil/ChangeLog,v 1.17 2005/09/18 07:07:12 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/skencil/ChangeLog,v 1.18 2005/11/17 23:45:20 herbs Exp $
+
+ 17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> skencil-0.6.17.ebuild:
+ Fixed multilib-strict issue, bug 98622. Re-add dropped ~amd64 keyword.
*skencil-0.6.17 (18 Sep 2005)
diff --git a/media-gfx/skencil/Manifest b/media-gfx/skencil/Manifest
index 8a07daf9f7a8..66e799e07f4f 100644
--- a/media-gfx/skencil/Manifest
+++ b/media-gfx/skencil/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 63e5df2d36bfe591a246939dc7e08a78 skencil-0.6.16.ebuild 1077
-MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
-MD5 ea516d283d0f79137ecceec887501bcc ChangeLog 2257
-MD5 2dc6012e4f12d7120a52f3d3f2884cd8 skencil-0.6.17.ebuild 1089
-MD5 c0d19d1776bb0445dd87a74dfc963da8 skencil-0.6.16_pre3.ebuild 1088
+MD5 0c7365253cd1df31201cc22c23c195b6 ChangeLog 2403
MD5 2ea05533c709cbd5828da5af9798d49c files/digest-skencil-0.6.16 67
-MD5 9c9922b39806ca56eed7ebdaaf3cea1c files/digest-skencil-0.6.17 67
MD5 9d7047c414b537db65e3518f5b39677a files/digest-skencil-0.6.16_pre3 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDLYl9FdQwWVoAgN4RAqAnAJ9mSUZjmPUTLcLgZC0TglGeUHBT+ACeI5lp
-biZOYp5mwdl/Zblja8NsaRQ=
-=5GRT
------END PGP SIGNATURE-----
+MD5 9c9922b39806ca56eed7ebdaaf3cea1c files/digest-skencil-0.6.17 67
+MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
+MD5 63e5df2d36bfe591a246939dc7e08a78 skencil-0.6.16.ebuild 1077
+MD5 c0d19d1776bb0445dd87a74dfc963da8 skencil-0.6.16_pre3.ebuild 1088
+MD5 7fd06fecedd4fda90c4674cdecf6acbd skencil-0.6.17.ebuild 1435
diff --git a/media-gfx/skencil/skencil-0.6.17.ebuild b/media-gfx/skencil/skencil-0.6.17.ebuild
index d04ca66443d7..ae7d3e9413ef 100644
--- a/media-gfx/skencil/skencil-0.6.17.ebuild
+++ b/media-gfx/skencil/skencil-0.6.17.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2005 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.1 2005/09/18 07:07:12 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/skencil/skencil-0.6.17.ebuild,v 1.2 2005/11/17 23:45:20 herbs Exp $
-inherit python
+inherit python multilib
IUSE="nls"
S=${WORKDIR}/${P/_/}
@@ -16,12 +16,24 @@ DEPEND=">=dev-python/imaging-1.1.2-r1
RDEPEND="!elibc_glibc? ( nls? ( sys-devel/gettext ) )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
pkg_setup() {
python_tkinter_exists
}
+src_unpack() {
+ unpack ${A}
+ # Fix hardcoded libdir
+ 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"
+ fi
+}
+
src_compile() {
use nls && useopts="${useopts} --with-nls"
./setup.py configure ${useopts} || die "setup.py configure failed"