diff options
author | Justin Lecher <jlec@gentoo.org> | 2012-06-07 17:34:48 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2012-06-07 17:34:48 +0000 |
commit | a81bc5d4e96c87d961fbe0049cc00f2f4a206752 (patch) | |
tree | e9fa34dc4c5693dafd8c3b3829dd7c84682ff94b /dev-tcltk | |
parent | inherit multilib for get_libdir (diff) | |
download | gentoo-2-a81bc5d4e96c87d961fbe0049cc00f2f4a206752.tar.gz gentoo-2-a81bc5d4e96c87d961fbe0049cc00f2f4a206752.tar.bz2 gentoo-2-a81bc5d4e96c87d961fbe0049cc00f2f4a206752.zip |
dev-tcltk/tclx: Moved to EAPI=4
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'dev-tcltk')
-rw-r--r-- | dev-tcltk/tclx/ChangeLog | 6 | ||||
-rw-r--r-- | dev-tcltk/tclx/metadata.xml | 12 | ||||
-rw-r--r-- | dev-tcltk/tclx/tclx-8.4-r2.ebuild | 25 |
3 files changed, 24 insertions, 19 deletions
diff --git a/dev-tcltk/tclx/ChangeLog b/dev-tcltk/tclx/ChangeLog index fdd429ddfe55..ab9298e3bc97 100644 --- a/dev-tcltk/tclx/ChangeLog +++ b/dev-tcltk/tclx/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-tcltk/tclx # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/ChangeLog,v 1.43 2012/04/30 15:00:58 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/ChangeLog,v 1.44 2012/06/07 17:34:48 jlec Exp $ + + 07 Jun 2012; Justin Lecher <jlec@gentoo.org> tclx-8.4-r2.ebuild, + metadata.xml: + Moved to EAPI=4 30 Apr 2012; Jeroen Roovers <jer@gentoo.org> files/tclx-8.4-ldflags.patch: Improve LDFLAGS patch. diff --git a/dev-tcltk/tclx/metadata.xml b/dev-tcltk/tclx/metadata.xml index 24c40b099615..30ee235ee80b 100644 --- a/dev-tcltk/tclx/metadata.xml +++ b/dev-tcltk/tclx/metadata.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>tcltk</herd> -<maintainer> - <email>tcltk@gentoo.org</email> - <description>TCL / TK herd</description> -</maintainer> -<longdescription>Extended TCL</longdescription> + <herd>tcltk</herd> + <maintainer> + <email>tcltk@gentoo.org</email> + <description>TCL / TK herd</description> + </maintainer> + <longdescription>Extended TCL</longdescription> </pkgmetadata> diff --git a/dev-tcltk/tclx/tclx-8.4-r2.ebuild b/dev-tcltk/tclx/tclx-8.4-r2.ebuild index 274564fb8219..24d4a8f23fd9 100644 --- a/dev-tcltk/tclx/tclx-8.4-r2.ebuild +++ b/dev-tcltk/tclx/tclx-8.4-r2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/tclx-8.4-r2.ebuild,v 1.1 2010/04/02 09:22:48 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tclx/tclx-8.4-r2.ebuild,v 1.2 2012/06/07 17:34:48 jlec Exp $ -EAPI="3" +EAPI=4 -inherit eutils +inherit eutils multilib DESCRIPTION="A set of extensions to TCL" HOMEPAGE="http://tclx.sourceforge.net" @@ -15,8 +15,10 @@ IUSE="tk threads" SLOT="0" KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos" -DEPEND=">=dev-lang/tcl-8.4.6 +DEPEND=" + >=dev-lang/tcl-8.4.6 tk? ( >=dev-lang/tk-8.4.6 )" +RDEPEND="${DEPEND}" S="${WORKDIR}"/${PN}${PV} @@ -24,9 +26,10 @@ S="${WORKDIR}"/${PN}${PV} RESTRICT="test" src_prepare() { - epatch "${FILESDIR}"/${P}-relid.patch - epatch "${FILESDIR}"/${P}-varinit.patch - epatch "${FILESDIR}"/${P}-ldflags.patch + epatch \ + "${FILESDIR}"/${P}-relid.patch \ + "${FILESDIR}"/${P}-varinit.patch \ + "${FILESDIR}"/${P}-ldflags.patch } src_configure() { @@ -34,8 +37,7 @@ src_configure() { $(use_enable tk) \ $(use_enable threads) \ --enable-shared \ - --with-tcl="${EPREFIX}/usr/lib/" \ - || die "econf failed" + --with-tcl="${EPREFIX}/usr/$(get_libdir)/" # adjust install_name on darwin if [[ ${CHOST} == *-darwin* ]]; then @@ -46,7 +48,6 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc ChangeLog README + default doman doc/*.[n3] } |