diff options
author | Jonathan Callen <jcallen@gentoo.org> | 2010-04-06 09:04:00 +0000 |
---|---|---|
committer | Jonathan Callen <jcallen@gentoo.org> | 2010-04-06 09:04:00 +0000 |
commit | c45f121d7dbd6b86cbb8fa8e97238b877243eaf4 (patch) | |
tree | edc600a394e33880b6bd06eb169bdbd526009bc7 /dev-lang | |
parent | Add patch to fix rudy. (diff) | |
download | historical-c45f121d7dbd6b86cbb8fa8e97238b877243eaf4.tar.gz historical-c45f121d7dbd6b86cbb8fa8e97238b877243eaf4.tar.bz2 historical-c45f121d7dbd6b86cbb8fa8e97238b877243eaf4.zip |
Bump to EAPI=3, add prefix keywords, many QA fixes
Package-Manager: portage--svn/cvs/Linux i686
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/ferite/ChangeLog | 7 | ||||
-rw-r--r-- | dev-lang/ferite/Manifest | 14 | ||||
-rw-r--r-- | dev-lang/ferite/ferite-1.0.2.ebuild | 74 |
3 files changed, 66 insertions, 29 deletions
diff --git a/dev-lang/ferite/ChangeLog b/dev-lang/ferite/ChangeLog index 5d854a1f1c95..2c228409ff06 100644 --- a/dev-lang/ferite/ChangeLog +++ b/dev-lang/ferite/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/ferite -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ferite/ChangeLog,v 1.29 2009/09/23 16:50:17 patrick Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ferite/ChangeLog,v 1.30 2010/04/06 09:04:00 abcd Exp $ + + 06 Apr 2010; Jonathan Callen <abcd@gentoo.org> ferite-1.0.2.ebuild: + Bump to EAPI=3, add prefix keywords, many QA fixes 23 Sep 2009; Patrick Lauer <patrick@gentoo.org> ferite-1.0.2.ebuild: Remove virtual/libc diff --git a/dev-lang/ferite/Manifest b/dev-lang/ferite/Manifest index 2bc8283f61aa..a2599f390bd2 100644 --- a/dev-lang/ferite/Manifest +++ b/dev-lang/ferite/Manifest @@ -1,4 +1,14 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST ferite-1.0.2.tar.gz 2039452 RMD160 3eb8fe2bbd66f188bd7aae92e7e48922e698a3ad SHA1 a0ab83b33d28d59fe0ff2b532ebbc42224df3461 SHA256 c67fc25451070214334ba2b1ca3a9ea78f5ed79f322e62ebf8fc9462bfe0fb8e -EBUILD ferite-1.0.2.ebuild 1674 RMD160 982fe52581685a32bf1af76927bf065209373b55 SHA1 2b1d714bde4ef1174cc69ad8bc85ebffa015fdb1 SHA256 7b863bc8b5c68a1b3bb17c5442f82f0b984c494dd0fb50646a385e94dd9a0df7 -MISC ChangeLog 3083 RMD160 c09c8482cf72871dc57cbaa0d0b80bc3abc39d99 SHA1 b2de99ace24d1689f05f278549971a173feaf613 SHA256 7d9bed9ec5a084893245ca3e6dffb0731c548c20566e7d0e4112d2a92fadeadf +EBUILD ferite-1.0.2.ebuild 2405 RMD160 01e3cd5dce9e9c5d659191467c64a1850801e75e SHA1 f59a09ad3d31b257e59bda5b39db9fba53dcc815 SHA256 78120744c35e78ea052c26ba91385bd39a682c32199b6d2d44c7d139eb555a9c +MISC ChangeLog 3204 RMD160 346c6bbda6cbe27cf765f94472f275d1acbd74c0 SHA1 f75fe74d540fd11047b2289233f748f82af2c5b9 SHA256 894755bcd11d0c82e8d0cdd653d4ee16238f596190d4db4a0400512e54aea2d4 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAku6+QkACgkQOypDUo0oQOp+fACfcvPOgDgX3OwngkwhZSchz0pN +eR4An38ETh/11USajuJHPk6KfJd0tEWV +=pWkq +-----END PGP SIGNATURE----- diff --git a/dev-lang/ferite/ferite-1.0.2.ebuild b/dev-lang/ferite/ferite-1.0.2.ebuild index a82cb82c8b92..11eda19de954 100644 --- a/dev-lang/ferite/ferite-1.0.2.ebuild +++ b/dev-lang/ferite/ferite-1.0.2.ebuild @@ -1,8 +1,10 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/ferite/ferite-1.0.2.ebuild,v 1.12 2009/09/23 16:50:17 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/ferite/ferite-1.0.2.ebuild,v 1.13 2010/04/06 09:04:00 abcd Exp $ -inherit multilib +EAPI="3" + +inherit multilib autotools DESCRIPTION="A clean, lightweight, object oriented scripting language" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" @@ -13,34 +15,56 @@ DEPEND=">=dev-libs/libpcre-5 SLOT="1" LICENSE="as-is" -KEYWORDS="~alpha amd64 ppc sparc x86" +KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" -src_unpack() { - unpack ${A} - cd "${S}" - sed -i -e '/^fbmdir/s:$(prefix)/share/doc/ferite:/usr/share/doc/${PF}:' Makefile.in - sed -i -e 's:$(prefix)/share/doc/ferite:${D}/usr/share/doc/${PF}:' docs/Makefile.in - sed -i -e '/$(docsdir)/s:$(DESTDIR)::' docs/Makefile.in - sed -i -e '/$(docsDATA_INSTALL)/s:$(DESTDIR)::' docs/Makefile.in - sed -i -e '/^LDFLAGS/s:LDFLAGS:#LDFLAGS:' modules/stream/Makefile.in - sed -i -e '/^testscriptsdir/s:$(prefix)/share/doc/ferite/:/usr/share/doc/${PF}/:' \ - scripts/test/Makefile.in - sed -i -e '/^testscriptsdir/s:$(prefix)/share/doc/ferite/:/usr/share/doc/${PF}/:' \ - scripts/test/rmi/Makefile.in - sed -i -e "s|\$prefix/lib|\$prefix/$(get_libdir)|g" configure +src_prepare() { + # use docsdir variable, install to DESTDIR + sed -i -e '/docsdir =/!s:$(prefix)/share/doc/ferite:$(DESTDIR)$(docsdir):' \ + docs/Makefile.am || die + + # Install docs to /usr/share/doc/${PF}, not .../${PN} + sed -i -e "s:doc/ferite:doc/${PF}:" \ + Makefile.am \ + docs/Makefile.am \ + scripts/test/Makefile.am \ + scripts/test/rmi/Makefile.am || die + + # Don't override the user's LDFLAGS + sed -i -e 's:_LDFLAGS = :&$(AM_LDFLAGS) :' \ + -e '/^LDFLAGS/s:^:AM_:' \ + modules/*/Makefile.am \ + libs/{aphex,triton}/src/Makefile.am \ + src/Makefile.am || die + + # Only build/install shared libs for modules (can't use static anyway) + sed -i -e '/_LDFLAGS/s:-module:& -shared:' modules/*/Makefile.am || die + + # use LIBADD to ensure proper deps (fix parellel build) + sed -i -e '/^stream_la_LDFLAGS/s:-L\. -lferitestream::' \ + -e '/^stream_la_LIBADD/s:$:libferitestream.la:' \ + modules/stream/Makefile.am || die + + # Make sure we install in $(get_libdir), not lib + sed -i -e "s|\$prefix/lib|\$prefix/$(get_libdir)|g" configure.ac || die + + # We copy feritedoc to ${T} in src_install, then patch it in-situ + # note that this doesn't actually work right, currently - it still tries + # to pull from / instead of ${D}, and I can't figure out how to fix that + sed -i -e 's:$(prefix)/bin/:${T}/:' docs/Makefile.am || die + + eautoreconf } -src_compile() { - econf --libdir=/usr/$(get_libdir)|| die - # Parallel make issues, see bug #244871 - emake -j1 || die +src_configure() { + econf --libdir="${EPREFIX}"/usr/$(get_libdir) } src_install() { cp tools/doc/feritedoc "${T}" - sed -i -e '/^prefix/s:prefix:${T}' -e "${T}"/feritedoc - sed -i -e '/^$prefix/s:$prefix/bin/ferite:{D}/usr/bin/ferite:' -e "${T}"/feritedoc - sed -i -e 's:build_c_api_docs.sh $(prefix)/bin/:build_c_api_docs.sh ${T}/:' docs/Makefile.in - make DESTDIR="${D}" LIBDIR=/usr/$(get_libdir) install || die + sed -i -e '/^prefix/s:prefix:${T}' "${T}"/feritedoc + sed -i -e '/^$prefix/s:$prefix/bin/ferite:'"${ED}"'usr/bin/ferite:' "${T}"/feritedoc + sed -i -e 's:$library_path $library_path:${S}/tools/doc ${S}/tools/doc:' "${T}"/feritedoc + export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${ED}usr/lib" + emake -j1 DESTDIR="${D}" LIBDIR="${EPREFIX}"/usr/$(get_libdir) install || die } |