projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 053cb66)
Moved to EAPI=4, handle static-libs correctly
authorJustin Lecher <jlec@gentoo.org>
Mon, 2 Jan 2012 22:13:19 +0000 (22:13 +0000)
committerJustin Lecher <jlec@gentoo.org>
Mon, 2 Jan 2012 22:13:19 +0000 (22:13 +0000)
Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

dev-tcltk/tdom/ChangeLog patch | blob | history
dev-tcltk/tdom/Manifest patch | blob | history
dev-tcltk/tdom/metadata.xml patch | blob | history
dev-tcltk/tdom/tdom-0.8.3.ebuild patch | blob | history

diff --git a/dev-tcltk/tdom/ChangeLog b/dev-tcltk/tdom/ChangeLog
index e827565fb77b68f5538192aa1a4185e0bd1373e9..40dfdd89238879dc1ef72293c86ed52ae6e1c81a 100644 (file)
--- a/dev-tcltk/tdom/ChangeLog
+++ b/dev-tcltk/tdom/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-tcltk/tdom
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/ChangeLog,v 1.11 2011/01/24 13:12:11 fauli Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/ChangeLog,v 1.12 2012/01/02 22:13:19 jlec Exp $
+
+  02 Jan 2012; Justin Lecher <jlec@gentoo.org> tdom-0.8.3.ebuild, metadata.xml:
+  Moved to EAPI=4, handle static-libs correctly
 
   24 Jan 2011; Christian Faulhammer <fauli@gentoo.org> tdom-0.8.2.ebuild:
   stable x86, bug 351766
diff --git a/dev-tcltk/tdom/Manifest b/dev-tcltk/tdom/Manifest
index f922d6a57e3f50a7d709744fce3314ae6a4266a3..8daf2b0ea5a2db20e4cbbd98660df376755248a6 100644 (file)
--- a/dev-tcltk/tdom/Manifest
+++ b/dev-tcltk/tdom/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX tdom-0.8.2-expat.patch 2454 RMD160 970b483eadcb4950d0cbdf1a53077bc001bdf7ff SHA1 6c6fe5de271414dcc6a19637f50213a34d233207 SHA256 acedb6caee024ef900dc04d1be1e48daf756db96d4367197386cd0899e1ad744
 AUX tdom-0.8.2-soname.patch 962 RMD160 5e012113e1b28fe26e6987ffd703f9938032feec SHA1 02c64bcf0686114bd6e461f4616da76a552b5014 SHA256 7e7fe06f0a4d647ecca9b963f561b68ca4aa125fd95ed5b73d5572303ee5babd
@@ -9,13 +9,13 @@ AUX tdom-0.8.3-expat.patch 2512 RMD160 7a763f6ee7683f3298425f1e42bac6432551af2f
 DIST tDOM-0.8.2.tgz 969804 RMD160 a0ca4c2e45b97c5a7bdfeee20165a537b7fe6d8b SHA1 c4ee4e013b084f8af57f35a2a06eb0a428508978 SHA256 561e482b95906b5a64b69cbc7c13d01b7a34a95144744796fbc1219042cd5843
 DIST tDOM-0.8.3.tgz 990367 RMD160 df52d8b7c3ac9134dae20a3bcaa21e0e512e3289 SHA1 1b7db0357ffb96c0a6c879c385168491380a8ca5 SHA256 496d5950907dd70db61bc20c55a05a5521363ce3c076e2fdd97270181bc720b9
 EBUILD tdom-0.8.2.ebuild 1586 RMD160 e4d865ab7020bb937779a34cdcaef789ef9989c1 SHA1 5e166e71874e610c08bafc5127e151b5587232af SHA256 ae8e3365747292f82d7b160bdc8a6e685e8ab3ce5528424064a09ad01f8d87e2
-EBUILD tdom-0.8.3.ebuild 1525 RMD160 2226ce5eb4750510b47d33fc4fb8241b3970a68e SHA1 a87d0a757910249db2a7d6944cf4c5a81d67bd0a SHA256 48e0f9012028b2ae227a583cc6ead8e55a5054fc886a097e47d94ae8ddfac33b
-MISC ChangeLog 1763 RMD160 ac6fd3d86236191e3152ce07b1a0887b7a5246a5 SHA1 67d0f57de3794477fe20db470479568a29537bb5 SHA256 b0746b6e5081b39513e87d3e236ced11ede715654f8cd9d9b02794599d9a5374
-MISC metadata.xml 506 RMD160 64acb4c60d16af9671c886bfddd131fffdda567e SHA1 782d04976241e8c6a4424f6df3dae44da5b66b22 SHA256 256ffec60ada12ee5e607bc03f92dd2b611a57a965734b020dda43969eb4270f
+EBUILD tdom-0.8.3.ebuild 1664 RMD160 1328ff08269f80e03a2e705b18f04428631933a7 SHA1 65bc9eb451c81dd65abeaf71f26e999352c60b28 SHA256 1ca92b4e0a4a8e0c35138d978c0d5885c0c1b4fb990e22be304c7137229b4cb0
+MISC ChangeLog 1891 RMD160 7c5629003869f21f35e49681045e9d9e67df566d SHA1 a42cea3a0ee35a25c6aff9b2a42f07ccf442f591 SHA256 5ae704689bf114c79c84916bc0cdacafc532920218781009b98b544b5c30e033
+MISC metadata.xml 508 RMD160 0ecbf5cb2a5c42fa36fa795b234c2282ed753f78 SHA1 05a533e8fe3073773179c717681ab601b53fffed SHA256 d9c09894f04bc0f13128c29fa668e7320db8e8c2e41b4fc06ac0a1845273a292
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk09e84ACgkQNQqtfCuFneMIGgCfW0glw/507OYiSKO6k0xDThbi
-fEEAn0RVJWgUW+Iwa/NEkzf6CCP69Egg
-=xAyw
+iEYEAREKAAYFAk8CLA0ACgkQgAnW8HDreRY9+gCdFzoDwY6Zus8bjEiXnpFnqQWq
+zZgAn01NniIgnVuPrZtvUak9X5RDM1vO
+=ab0u
 -----END PGP SIGNATURE-----
diff --git a/dev-tcltk/tdom/metadata.xml b/dev-tcltk/tdom/metadata.xml
index 8ea740992822d71d5b1e093e5faface76c452e8e..8de41d4281f00075e7cff5ef9dbc90d882ef8db4 100644 (file)
--- a/dev-tcltk/tdom/metadata.xml
+++ b/dev-tcltk/tdom/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tcltk</herd>
-<longdescription>
+       <herd>tcltk</herd>
+       <longdescription>
 tDOM combines high performance XML data processing with easy and
 powerful Tcl scripting functionality. tDOM should be one of the fastest
 ways to manipulate XML with a scripting language and uses very few
diff --git a/dev-tcltk/tdom/tdom-0.8.3.ebuild b/dev-tcltk/tdom/tdom-0.8.3.ebuild
index f8aa5a7b2e47df74d15234055495c8c466ee6380..6f17856769ae03978a4ac3917fca29162e475fb4 100644 (file)
--- a/dev-tcltk/tdom/tdom-0.8.3.ebuild
+++ b/dev-tcltk/tdom/tdom-0.8.3.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2011 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/tdom/tdom-0.8.3.ebuild,v 1.1 2011/01/21 08:00:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tdom/tdom-0.8.3.ebuild,v 1.2 2012/01/02 22:13:19 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
-inherit autotools eutils
+inherit autotools eutils multilib
 
 MY_P="tDOM-${PV}"
 
 DESCRIPTION="A XML/DOM/XPath/XSLT Implementation for Tcl"
-HOMEPAGE="http://tdom.github.com"
-SRC_URI="http://cloud.github.com/downloads/tDOM/${PN}/${MY_P}.tgz"
+HOMEPAGE="http://tdom.github.com/"
+#SRC_URI="http://cloud.github.com/downloads/tDOM/${PN}/${MY_P}.tgz"
+SRC_URI="mirror://github/tDOM/${PN}/${MY_P}.tgz"
 
 LICENSE="MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="threads"
+IUSE="static-libs threads"
 
 DEPEND="
        dev-lang/tcl
@@ -24,42 +25,37 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+       "${FILESDIR}/"${PN}-0.8.2.patch
+       "${FILESDIR}/"${PN}-0.8.2-soname.patch
+       "${FILESDIR}/"${P}-expat.patch
+       "${FILESDIR}/"${PN}-0.8.2-tnc.patch
+       )
+
 src_prepare() {
-       epatch \
-               "${FILESDIR}/"${PN}-0.8.2.patch \
-               "${FILESDIR}/"${PN}-0.8.2-soname.patch \
-               "${FILESDIR}/"${P}-expat.patch \
-               "${FILESDIR}/"${PN}-0.8.2-tnc.patch
+       epatch "${PATCHES[@]}"
        eautoreconf
 }
 
 src_configure() {
-       local myconf=""
-
-       myconf="${myconf}
+       local myeconfargs=(
                $(use_enable threads)
                --enable-shared
                --disable-tdomalloc
-               --with-expat"
-
-       cd "${S}"/unix
-       ECONF_SOURCE=".." econf ${myconf}
+               --with-expat
+               )
 
-       # compile tdomhtml
-       cd "${S}"/extensions/tdomhtml
-       econf
-
-       # compile tnc
-       cd "${S}"/extensions/tnc
-       econf ${myconf}
+       cd "${S}"/unix && ECONF_SOURCE=".." econf ${myeconfargs}
+       cd "${S}"/extensions/tdomhtml &&        econf ${myeconfargs}
+       cd "${S}"/extensions/tnc && econf ${myeconfargs}
 }
 
 src_compile() {
        local dir
 
-       for dir in "${S}"/unix "${S}"/extensions/tdomhtml "${S}"/extensions/tnc; do
+       for dir in "${S}"/unix "${S}"/extensions/tnc; do
                pushd ${dir} > /dev/null
-                       emake || die
+                       emake
                popd > /dev/null
        done
 }
@@ -67,11 +63,16 @@ src_compile() {
 src_install() {
        local dir
 
-       dodoc CHANGES ChangeLog README* || die
+       dodoc CHANGES ChangeLog README*
 
        for dir in "${S}"/unix "${S}"/extensions/tdomhtml "${S}"/extensions/tnc; do
                pushd ${dir} > /dev/null
-                       emake DESTDIR="${D}" install || die
+                       emake DESTDIR="${D}" install
                popd > /dev/null
        done
+
+       if ! use static-libs; then
+               einfo "Removing static libs ..."
+               rm -f "${ED}"/usr/$(get_libdir)/*.{a,la} || die
+       fi
 }
Unnamed repository; edit this file 'description' to name the repository.