From c2396f005ad3d9613719b2b9a7f6e51c8a803ccf Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Tue, 11 Oct 2011 01:39:11 +0000 Subject: [PATCH] USE="static-libs" and remove useless libtool archive. Force recent enough graphviz wrt #181147 in order to remove pkg_setup() test. Package-Manager: portage-2.2.0_alpha64/cvs/Linux x86_64 --- media-libs/libdvbpsi/ChangeLog | 6 ++- media-libs/libdvbpsi/Manifest | 14 +++-- media-libs/libdvbpsi/libdvbpsi-0.2.1.ebuild | 58 ++++++++------------- 3 files changed, 35 insertions(+), 43 deletions(-) diff --git a/media-libs/libdvbpsi/ChangeLog b/media-libs/libdvbpsi/ChangeLog index 5075eda356f3..aa4869eb8864 100644 --- a/media-libs/libdvbpsi/ChangeLog +++ b/media-libs/libdvbpsi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libdvbpsi # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvbpsi/ChangeLog,v 1.43 2011/09/20 17:50:21 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvbpsi/ChangeLog,v 1.44 2011/10/11 01:39:11 ssuominen Exp $ + + 11 Oct 2011; Samuli Suominen libdvbpsi-0.2.1.ebuild: + USE="static-libs" and remove useless libtool archive. Force recent enough + graphviz wrt #181147 in order to remove pkg_setup() test. *libdvbpsi-0.2.1 (20 Sep 2011) diff --git a/media-libs/libdvbpsi/Manifest b/media-libs/libdvbpsi/Manifest index 84d37ffde0bd..9162fa685644 100644 --- a/media-libs/libdvbpsi/Manifest +++ b/media-libs/libdvbpsi/Manifest @@ -20,13 +20,17 @@ EBUILD libdvbpsi-0.1.5.ebuild 1794 RMD160 570c2d96d9b7cc94c44694477ed0cdec400a2f EBUILD libdvbpsi-0.1.6.ebuild 1916 RMD160 c7af257a1490b7f965c101a3b3a04f947c53f61d SHA1 451524429a4cea06290ad6b15c21a43bdeb69ea8 SHA256 82883707d5190df4c4aa97d756dffd13ce3599e8a55334d99c89645ed0bcf316 EBUILD libdvbpsi-0.1.7.ebuild 1477 RMD160 7f1d013e2def927a12b2cc441d6f7aeefd355322 SHA1 662fbdfec87af833bdf951809085b5f1cb3ba994 SHA256 4bcf8ad49c9767cce829826c72c213cd34d84a23c6e9176b19a6116affbca380 EBUILD libdvbpsi-0.2.0.ebuild 1480 RMD160 234956ba22875efc9dce5a1ffe9bac4756b06b19 SHA1 95ca2c2fefcffb052e4ab5755004daeebd1145d8 SHA256 9fc5f1d6175ad52e189f544c098625e45a712c45da1c0fa5391dc1be89ba9972 -EBUILD libdvbpsi-0.2.1.ebuild 1480 RMD160 dfd13a618a12f0f7fb556b99aaec67f7ec6d2949 SHA1 30f62608efe3d22770722f5c9313847c38c8a0f0 SHA256 a9aded260461435f72dacb21c341dd1ddde615f13e2c94d7b0f11971fe5824d6 -MISC ChangeLog 5632 RMD160 016a423b80880371ae6888730d469487b303f38d SHA1 275f7f534aa1a4c9f0f006c74b7a83dbe23d7ada SHA256 ea7c1b3151ee10dc3bb36836eef7e9d8e102badb6eeb043f6868d92123b575c6 +EBUILD libdvbpsi-0.2.1.ebuild 940 RMD160 9c25458c104f6371b7d1d7bc8ebf19bbf1c268eb SHA1 c9cb2e7f635fdb54f50af1efc35f65b207980417 SHA256 ffa7d475a0fe4c85fc1b0b998b2f1508ca424380bcb860e3a2d4e1cfca76d228 +MISC ChangeLog 5848 RMD160 ccd77bb6f90eacdf9076439806f30e0c91b2f312 SHA1 29461f6c4e68da3cd0be3825fbc27ec953ead017 SHA256 f6a653445dce66409940cd71c2aaa427b6f2e18d9c2914d6a7b9c6eb223492f3 MISC metadata.xml 220 RMD160 a9b85bac1dbf4d0cee2271829853a2f53f4427f9 SHA1 d0c104d1096d6af5fc1b1631c4cda1af5da798e8 SHA256 2356fe6e618f7034ca8cb3c804d7c4deb01252923d4935d311a599b38a8ac69d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk540mQACgkQvFcC4BYPU0qeAACdETcKKnXbUXK7YHZJEULBq4Z5 -qjYAnRnSUjH6Q3XxgtvGK+cVywmEg2tz -=RUKp +iQEcBAEBAgAGBQJOk55QAAoJEEdUh39IaPFN8sUIAJfAa6oQN9RZHiJ8Mm9O6g/U +X7pSdNAJApQC5dVBbZOn9LCOyziEP9ZA9J4IIS8JtpokW+Fs+n6ALIQ2GIwCTHkF +XX0Sl2A4ypggLuW+2gspZvdM+mJUYiY76opccceGja+bZvR8TD5sdRJDQPlMpEQP +zfoHvrve+quT+U4P3ItYUPihDqkbCFVloSsWNDzrmaN0Gqd9PSeK9OUcVlH3dLop +ypubsHeO+HA7+Y2CICXt6TFlre6g0nSICU+UwSu7ero9OCMuVPR0zNv9g3JlBz2x +C8akrq3zGNLp5/VX9WBAhqi0ruteibRYW9qvi7kl6X1cloeIgs+HUiCrLmxDm18= +=Ii4G -----END PGP SIGNATURE----- diff --git a/media-libs/libdvbpsi/libdvbpsi-0.2.1.ebuild b/media-libs/libdvbpsi/libdvbpsi-0.2.1.ebuild index 293a46e8b30f..d3fd460a421a 100644 --- a/media-libs/libdvbpsi/libdvbpsi-0.2.1.ebuild +++ b/media-libs/libdvbpsi/libdvbpsi-0.2.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvbpsi/libdvbpsi-0.2.1.ebuild,v 1.1 2011/09/20 17:50:21 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvbpsi/libdvbpsi-0.2.1.ebuild,v 1.2 2011/10/11 01:39:11 ssuominen Exp $ -IUSE="doc" +EAPI=4 DESCRIPTION="library for MPEG TS/DVB PSI tables decoding and generation" HOMEPAGE="http://www.videolan.org/libdvbpsi" @@ -10,47 +10,31 @@ SRC_URI="http://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" -# doxygen missing: ~ia64 KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="doc static-libs" -DEPEND="doc? ( - >=app-doc/doxygen-1.2.16 - media-gfx/graphviz - )" RDEPEND="" - -pkg_setup() { - if use doc; then - # Making the documentation requires that /usr/bin/dot from - # media-libs/graphviz supports PNG output. - # This is an automagic dependency :(, Bug #181147 - # Check that /usr/bin/dot supports png by calling it with - # an unsupported format (-Txxx) to get a list of supported formats - - if /usr/bin/dot -Txxx 2>&1 | grep -q png ; then - # dot supports png - : - else - die "You need to recompile media-gfx/graphviz with png support." - fi - fi +DEPEND=" + doc? ( + app-doc/doxygen + >=media-gfx/graphviz-2.26 + )" # Require recent enough graphviz wrt #181147 + +DOCS=( AUTHORS ChangeLog NEWS README TODO ) + +src_configure() { + econf \ + $(use_enable static-libs static) \ + --enable-release } src_compile() { - econf --enable-release - - emake || die "emake failed" - - if use doc; then - einfo "Attempting to build documentation" - emake doc || die "Could not build documentation." - else - einfo "Documentation was not built" - fi + emake + use doc && emake doc } -src_install () { - emake DESTDIR="${D}" install || die - use doc && dohtml "${S}"/doc/doxygen/html/* - dodoc AUTHORS INSTALL README NEWS +src_install() { + default + use doc && dohtml doc/doxygen/html/* + rm -f "${ED}"usr/lib*/${PN}.la } -- 2.26.2