From: Tomas Chvatal Date: Fri, 9 Sep 2011 15:25:21 +0000 (+0000) Subject: Revision bump to punt libtool archive and static library. Punt older overshadowed... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=83b321888a24eef2a551e077c488510aff0dff47;p=gentoo.git Revision bump to punt libtool archive and static library. Punt older overshadowed versions. Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64 --- diff --git a/media-gfx/exiv2/ChangeLog b/media-gfx/exiv2/ChangeLog index aec611bdbfc8..8427ce7623d7 100644 --- a/media-gfx/exiv2/ChangeLog +++ b/media-gfx/exiv2/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-gfx/exiv2 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.95 2011/08/15 18:32:13 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.96 2011/09/09 15:25:20 scarabeus Exp $ + +*exiv2-0.21.1-r2 (09 Sep 2011) + + 09 Sep 2011; Tomáš Chvátal -exiv2-0.20.ebuild, + -exiv2-0.21.ebuild, -exiv2-0.21-r1.ebuild, -exiv2-0.21.1.ebuild, + exiv2-0.21.1-r1.ebuild, +exiv2-0.21.1-r2.ebuild, + -files/exiv2-0.21-xmp-fix.patch: + Revision bump to punt libtool archive and static library. Punt older + overshadowed versions. 15 Aug 2011; Markus Meier exiv2-0.21.1-r1.ebuild: x86 stable, bug #377465 diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index cea4c6b55d7b..dd3202c2faf6 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -2,24 +2,28 @@ Hash: SHA1 AUX exiv2-0.19-syntax-fix.patch 598 RMD160 f59d55322ee8d945bc1a604d28952269a7fa6026 SHA1 a0147e32756f1036c6631d14d79b06d270213e1f SHA256 41a6fe03d35fca3ad46c43776d682ab9acc0a395ecb5261fd6c550a7dc2a07c3 -AUX exiv2-0.21-xmp-fix.patch 496 RMD160 f36938d4f8df339f926c3c8eba0db91303e67e0d SHA1 abed499570778289b690ace670a08bd77ff13487 SHA256 2fdca07d3affdc53a60ab85341c6a8cb271713a6f691a6310234e03e562114b6 AUX exiv2-0.21.1-time-fix.patch 1979 RMD160 28a27ed38a171820b8e6d98af13b941f0ae554c5 SHA1 cc6dd00ac2e2cde48a50c418c0e5890cffa9f81a SHA256 7ea4fe457dae5ff41090eafedb9c6e181c4dd4f214ec49a958e6cce73f790b46 DIST exiv2-0.19.tar.gz 2658781 RMD160 263267fb75341a6eb60e5201b88bfea11ef18eea SHA1 4ab8d830094f2842bc286d8e7fb03100ca7f07b1 SHA256 1733dab5e81d9cf4e0b3d6eeed009103e5baff4fecfc127ecee016b3a67c51ef -DIST exiv2-0.20.tar.gz 2941045 RMD160 f318cc45e0b512cbe508c19bf5bee7397b0ba15a SHA1 3ebab0acd114a463fe11881bd95f1c3e258c7c0c SHA256 7485f252c18119e61cdf1d73487bf0c5e3da6707decd6238407504847b323972 DIST exiv2-0.21.1.tar.gz 3004521 RMD160 8eaddf863500c391d2d779747b24d6eb004b1d9f SHA1 d33e0efbad5d6a7af7f2e6d1d0beb6e7c941cfca SHA256 2edae035760f84afdfebdf3123a166e6bbf77870697afe54dea92a783f041817 -DIST exiv2-0.21.tar.gz 3002066 RMD160 654207f134320f9a65acfa5dca5f7a40b2e0dfcc SHA1 0961422a647e052a8db6e56e8818ab3217c37b01 SHA256 d827d7a4e617b042203ebd04b5bc259690ec699aa2c71b78d5682718d68737e5 EBUILD exiv2-0.19.ebuild 2953 RMD160 e6dcc35ab0cfddeee50d7ec9836d311554e75b1e SHA1 999223d0d67c595a678784dccf1bd328dd72ca42 SHA256 3ef18ce855444746b00b22f0927f093f05653c8046110527fb53fbf0ba41248b -EBUILD exiv2-0.20.ebuild 2989 RMD160 8b7a773841423e1b4dce65bbfddf893d17cbd756 SHA1 db90754d3a10dc614a6f444f530334a0c0b3bf71 SHA256 6e0f5810d184b9f8e594d5f7c288436cab3b7403164ba57e53f903918b6d5f53 -EBUILD exiv2-0.21-r1.ebuild 3021 RMD160 e71ecb9aa89e668b0ee3f12d561201f6b928ef3f SHA1 6e65237f303118e6c7eeb01cd2bcd30a64f406e7 SHA256 fd9ba54d924e6867e317bab665c1a963047a95643218c992eb7cf044b81a1bda -EBUILD exiv2-0.21.1-r1.ebuild 3498 RMD160 4b7e8d2a656e7189e0f0bb490d2539c95b3c6fc2 SHA1 8ad9a28e0f3ceb53faac4fea23f553ddad1a7994 SHA256 6ee16cae071bc2c4a23b63c19a572c28f5874fd13264b56f4664e5fec2be236e -EBUILD exiv2-0.21.1.ebuild 3392 RMD160 2e0d17754b82caadf863c3582ceddc8c80e5de57 SHA1 736af89964c0b3b6208e890bb61f7db336f584b3 SHA256 710a0976fc6a7401d9e23a992b63ecabe59dec1f490d98cb03cde21a780bbd8b -EBUILD exiv2-0.21.ebuild 2976 RMD160 04320c7d430172dd05f9632f0ebfa567a492fcde SHA1 a6cac9b57e9c25269082055b1cecf08d1fd7b2b6 SHA256 7722ca355cf1f0690e0ffd06c527cf61c3a7d105559af13a3798367f70112636 -MISC ChangeLog 11750 RMD160 c91d1410e1436b70f8ac8a0afd8fe5733d8dda48 SHA1 c2c2781c491f67a6ab9e84e1e98e3428d126a0f6 SHA256 bd2ef7b832b4c04f142d169100cb66495582018de7d54fa176353ddf811f155f +EBUILD exiv2-0.21.1-r1.ebuild 3569 RMD160 76f5c4185d2595605dc399192a1cbefe60a8d48d SHA1 18a2a76719efb379e77df59d2c416950868e2bc9 SHA256 ac7602aaf866f894697c4826edf9d7bab6d8c94a7bbc51cab57f9bf1fb456da1 +EBUILD exiv2-0.21.1-r2.ebuild 3571 RMD160 e32c0544aebc399a39373f9c4e66c30417ffbeb5 SHA1 76519b6cb91465c6e326f2119433d116065367d6 SHA256 957e0e0a495828083462f1422d3b8f69c4d05aa1ab13759400a7dffb0cf6e0ef +MISC ChangeLog 12110 RMD160 6cf836aa38465991cd1da771015860b1a364798f SHA1 af963fe7e7eba0bd6fc4014e0978184d25599d35 SHA256 5d6d9d3729863d2d23faaa76a79a8b60f5a87c1ab7005743f6074eb2183671a0 MISC metadata.xml 499 RMD160 977e5210d3b213c9c743a476d77737af81ca805a SHA1 1784af211aba78b938559b591cd6d6d3bae0427f SHA256 d536220947772cba94e4d08e8da8139987413ded44f779e62165ea308bffb5ff -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk5JZmAACgkQkKaRLQcq0GJ6ZACeMblL7ncGCiIF2vHFQ8xUh58/ -qbMAniJjUNh2L78hSgYOYnBELT4bmZ/H -=H4NN +iQIcBAEBAgAGBQJOai/zAAoJEOSiRoyO7jvoRKUQAIKTeqhRQyvwOScS6pMF22W1 +1bir3uxWT7MOojddGjHd7382azvMaJ9zplNcU4FHNR1tF2kaewtVkQ4xbPm4ODf1 +ZM7P7qYKmu8D6cJXIMHe6zuHrA5PhXlTZjdeYe0gvWFZxDDs64zUaFNx9YeaCKdX +zKwso97Woz4WzDwu7W/3U5AC465hoUMTzPPuRd+mB/ZDjCl7/hQnt4wtpF2oxK26 +b8jhpsQCndYVtXACACjsSdDHILU54r2D05L7Cj6FU31xXctSrldPJPEbKeYztgY9 +TkK9vhXGDXU3B32L5e2gG4u2IWkgAkhWtLs6utd6H7CbiZ8aJHgCywxiR/WBSEnJ +D/6GKMvE/Ek6Gby5fTnXIm3eH55Vt0El8qm/WEpSokYW0mWhmrODgW4K6AREQ/Qj ++Gr18Em5WHMu/AUdm1XxOzuvTQZAnkiyDQSsMspn8yATHrQdmcdPW/5PICi0UOhX +VeafER+skKuWxroEjUMflK0YecV6284cxMWiGrjBhBgYkCU73NVFq8kP4FcydmsH +3NYL59X3SamNhhcBTugyW0fDlFHmhQUfar+ALvPlghsywmFiJCcCekJZ0m+RO4vz +1uudqoE7ExQfwZKNK/J/Zpmusp6Dk47FQR4/ZgSGKLg5FqNxrxluYnBElr42LpUK +8TTgqc73BLPTHXGGapwX +=6NEG -----END PGP SIGNATURE----- diff --git a/media-gfx/exiv2/exiv2-0.20.ebuild b/media-gfx/exiv2/exiv2-0.20.ebuild deleted file mode 100644 index e89a087b017e..000000000000 --- a/media-gfx/exiv2/exiv2-0.20.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.20.ebuild,v 1.1 2010/07/20 20:43:32 sbriesen Exp $ - -EAPI="2" -PYTHON_DEPEND="2" - -inherit eutils multilib toolchain-funcs python - -DESCRIPTION="EXIF and IPTC metadata C++ library and command line utility" -HOMEPAGE="http://www.exiv2.org/" -SRC_URI="http://www.exiv2.org/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="contrib doc examples nls unicode xmp zlib" -IUSE_LINGUAS="de es fi fr pl ru sk" -IUSE="${IUSE} $(printf 'linguas_%s ' ${IUSE_LINGUAS})" - -RDEPEND=" - virtual/libiconv - nls? ( virtual/libintl ) - xmp? ( dev-libs/expat ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND} - contrib? ( >=dev-libs/boost-1.37 ) - doc? ( - app-doc/doxygen - dev-libs/libxslt - dev-util/pkgconfig - media-gfx/graphviz - ) - nls? ( sys-devel/gettext ) -" - -src_prepare() { - if use unicode; then - for i in doc/cmd.txt; do - einfo "Converting "${i}" to UTF-8" - iconv -f LATIN1 -t UTF-8 "${i}" > "${i}~" && mv -f "${i}~" "${i}" || rm -f "${i}~" - done - fi - - if use doc; then - einfo "Updating doxygen config" - doxygen 2>&1 >/dev/null -u config/Doxyfile - fi - - if use contrib; then - # create build environment for contrib - ln -snf ../../src contrib/organize/exiv2 - sed -i -e 's:/usr/local/include/.*:/usr/include:g' \ - -e 's:/usr/local/lib/lib:-l:g' -e 's:-gcc..-mt-._..\.a::g' \ - contrib/organize/boost.mk - fi - - # fix python shebang - python_convert_shebangs -r 2 doc/templates -} - -src_configure() { - local myconf="$(use_enable nls) $(use_enable xmp)" - use zlib || myconf="${myconf} --without-zlib" # plain 'use_with' fails - - # Bug #78720. amd64/gcc-3.4/-fvisibility* fail. - if [[ $(gcc-major-version) -lt 4 ]]; then - use amd64 && myconf="${myconf} --disable-visibility" - fi - - econf ${myconf} -} - -src_compile() { - emake || die "emake failed" - - if use contrib; then - emake -C contrib/organize \ - LDFLAGS="\$(BOOST_LIBS) -L../../src -lexiv2 ${LDFLAGS}" \ - CPPFLAGS="${CPPFLAGS} -I\$(BOOST_INC_DIR) -I. -DEXV_HAVE_STDINT_H" \ - || die "emake organize failed" - fi - - if use doc; then - emake doc || die "emake doc failed" - fi -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - if use contrib; then - emake DESTDIR="${D}" -C contrib/organize install || die "emake install organize failed" - fi - - dodoc README doc/{ChangeLog,cmd.txt} - use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} - use doc && dohtml -r doc/html/. - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins samples/*.cpp - fi -} - -pkg_postinst() { - ewarn - ewarn "PLEASE PLEASE take note of this:" - ewarn "Please make *sure* to run revdep-rebuild now" - ewarn "Certain things on your system may have linked against a" - ewarn "different version of exiv2 -- those things need to be" - ewarn "recompiled. Sorry for the inconvenience!" - ewarn -} diff --git a/media-gfx/exiv2/exiv2-0.21-r1.ebuild b/media-gfx/exiv2/exiv2-0.21-r1.ebuild deleted file mode 100644 index d50fb0e12e44..000000000000 --- a/media-gfx/exiv2/exiv2-0.21-r1.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.21-r1.ebuild,v 1.1 2010/12/21 12:31:54 sbriesen Exp $ - -EAPI="2" -PYTHON_DEPEND="2" - -inherit eutils multilib toolchain-funcs python - -DESCRIPTION="EXIF and IPTC metadata C++ library and command line utility" -HOMEPAGE="http://www.exiv2.org/" -SRC_URI="http://www.exiv2.org/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="contrib doc examples nls xmp zlib" -IUSE_LINGUAS="de es fi fr pl ru sk" -IUSE="${IUSE} $(printf 'linguas_%s ' ${IUSE_LINGUAS})" - -RDEPEND=" - virtual/libiconv - nls? ( virtual/libintl ) - xmp? ( dev-libs/expat ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND} - contrib? ( >=dev-libs/boost-1.37 ) - doc? ( - app-doc/doxygen - dev-libs/libxslt - dev-util/pkgconfig - media-gfx/graphviz - ) - nls? ( sys-devel/gettext ) -" - -src_prepare() { - epatch "${FILESDIR}/${P}-xmp-fix.patch" - - # convert docs to UTF-8 - for i in doc/cmd.txt; do - einfo "Converting "${i}" to UTF-8" - iconv -f LATIN1 -t UTF-8 "${i}" > "${i}~" && mv -f "${i}~" "${i}" || rm -f "${i}~" - done - - if use doc; then - einfo "Updating doxygen config" - doxygen 2>&1 >/dev/null -u config/Doxyfile - fi - - if use contrib; then - # create build environment for contrib - ln -snf ../../src contrib/organize/exiv2 - sed -i -e 's:/usr/local/include/.*:/usr/include:g' \ - -e 's:/usr/local/lib/lib:-l:g' -e 's:-gcc..-mt-._..\.a::g' \ - contrib/organize/boost.mk - fi - - # fix python shebang - python_convert_shebangs -r 2 doc/templates -} - -src_configure() { - local myconf="$(use_enable nls) $(use_enable xmp)" - use zlib || myconf="${myconf} --without-zlib" # plain 'use_with' fails - - # Bug #78720. amd64/gcc-3.4/-fvisibility* fail. - if [[ $(gcc-major-version) -lt 4 ]]; then - use amd64 && myconf="${myconf} --disable-visibility" - fi - - econf ${myconf} -} - -src_compile() { - emake || die "emake failed" - - if use contrib; then - emake -C contrib/organize \ - LDFLAGS="\$(BOOST_LIBS) -L../../src -lexiv2 ${LDFLAGS}" \ - CPPFLAGS="${CPPFLAGS} -I\$(BOOST_INC_DIR) -I. -DEXV_HAVE_STDINT_H" \ - || die "emake organize failed" - fi - - if use doc; then - emake doc || die "emake doc failed" - fi -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - if use contrib; then - emake DESTDIR="${D}" -C contrib/organize install || die "emake install organize failed" - fi - - dodoc README doc/{ChangeLog,cmd.txt} - use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} - use doc && dohtml -r doc/html/. - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins samples/*.cpp - fi -} - -pkg_postinst() { - ewarn - ewarn "PLEASE PLEASE take note of this:" - ewarn "Please make *sure* to run revdep-rebuild now" - ewarn "Certain things on your system may have linked against a" - ewarn "different version of exiv2 -- those things need to be" - ewarn "recompiled. Sorry for the inconvenience!" - ewarn -} diff --git a/media-gfx/exiv2/exiv2-0.21.1-r1.ebuild b/media-gfx/exiv2/exiv2-0.21.1-r1.ebuild index f6a89f7416a3..c2ea9d8a4e4a 100644 --- a/media-gfx/exiv2/exiv2-0.21.1-r1.ebuild +++ b/media-gfx/exiv2/exiv2-0.21.1-r1.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-gfx/exiv2/exiv2-0.21.1-r1.ebuild,v 1.3 2011/08/15 18:32:13 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.21.1-r1.ebuild,v 1.4 2011/09/09 15:25:21 scarabeus Exp $ -EAPI="2" +EAPI=3 PYTHON_DEPEND="2" inherit eutils multilib toolchain-funcs python @@ -81,7 +81,9 @@ src_configure() { use amd64 && myconf="${myconf} --disable-visibility" fi - econf ${myconf} + econf \ + --disable-static \ + ${myconf} } src_compile() { @@ -102,6 +104,8 @@ src_compile() { src_install() { emake DESTDIR="${D}" install || die "emake install failed" + find "${ED}" -name '*.la' -exec rm -f {} + + if use contrib; then emake DESTDIR="${D}" -C contrib/organize install || die "emake install organize failed" fi diff --git a/media-gfx/exiv2/exiv2-0.21.1.ebuild b/media-gfx/exiv2/exiv2-0.21.1-r2.ebuild similarity index 91% rename from media-gfx/exiv2/exiv2-0.21.1.ebuild rename to media-gfx/exiv2/exiv2-0.21.1-r2.ebuild index ebba2543b62a..fe8a0c72f766 100644 --- a/media-gfx/exiv2/exiv2-0.21.1.ebuild +++ b/media-gfx/exiv2/exiv2-0.21.1-r2.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-gfx/exiv2/exiv2-0.21.1.ebuild,v 1.1 2011/04/02 23:46:37 sbriesen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.21.1-r2.ebuild,v 1.1 2011/09/09 15:25:21 scarabeus Exp $ -EAPI="2" +EAPI=3 PYTHON_DEPEND="2" inherit eutils multilib toolchain-funcs python @@ -46,6 +46,9 @@ src_prepare() { 's|^\(#include .*\)|#define BOOST_FILESYSTEM_VERSION 2\n\1|g' \ contrib/organize/helpers.hpp + # fix for off by 1 hour date error for -T option (bug #368419) + epatch "${FILESDIR}/${P}-time-fix.patch" + # convert docs to UTF-8 for i in doc/cmd.txt; do einfo "Converting "${i}" to UTF-8" @@ -78,7 +81,9 @@ src_configure() { use amd64 && myconf="${myconf} --disable-visibility" fi - econf ${myconf} + econf \ + --disable-static \ + ${myconf} } src_compile() { @@ -99,6 +104,8 @@ src_compile() { src_install() { emake DESTDIR="${D}" install || die "emake install failed" + find "${ED}" -name '*.la' -exec rm -f {} + + if use contrib; then emake DESTDIR="${D}" -C contrib/organize install || die "emake install organize failed" fi diff --git a/media-gfx/exiv2/exiv2-0.21.ebuild b/media-gfx/exiv2/exiv2-0.21.ebuild deleted file mode 100644 index 74a6cf935184..000000000000 --- a/media-gfx/exiv2/exiv2-0.21.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.21.ebuild,v 1.1 2010/12/19 13:01:45 sbriesen Exp $ - -EAPI="2" -PYTHON_DEPEND="2" - -inherit eutils multilib toolchain-funcs python - -DESCRIPTION="EXIF and IPTC metadata C++ library and command line utility" -HOMEPAGE="http://www.exiv2.org/" -SRC_URI="http://www.exiv2.org/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="contrib doc examples nls xmp zlib" -IUSE_LINGUAS="de es fi fr pl ru sk" -IUSE="${IUSE} $(printf 'linguas_%s ' ${IUSE_LINGUAS})" - -RDEPEND=" - virtual/libiconv - nls? ( virtual/libintl ) - xmp? ( dev-libs/expat ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND} - contrib? ( >=dev-libs/boost-1.37 ) - doc? ( - app-doc/doxygen - dev-libs/libxslt - dev-util/pkgconfig - media-gfx/graphviz - ) - nls? ( sys-devel/gettext ) -" - -src_prepare() { - # convert docs to UTF-8 - for i in doc/cmd.txt; do - einfo "Converting "${i}" to UTF-8" - iconv -f LATIN1 -t UTF-8 "${i}" > "${i}~" && mv -f "${i}~" "${i}" || rm -f "${i}~" - done - - if use doc; then - einfo "Updating doxygen config" - doxygen 2>&1 >/dev/null -u config/Doxyfile - fi - - if use contrib; then - # create build environment for contrib - ln -snf ../../src contrib/organize/exiv2 - sed -i -e 's:/usr/local/include/.*:/usr/include:g' \ - -e 's:/usr/local/lib/lib:-l:g' -e 's:-gcc..-mt-._..\.a::g' \ - contrib/organize/boost.mk - fi - - # fix python shebang - python_convert_shebangs -r 2 doc/templates -} - -src_configure() { - local myconf="$(use_enable nls) $(use_enable xmp)" - use zlib || myconf="${myconf} --without-zlib" # plain 'use_with' fails - - # Bug #78720. amd64/gcc-3.4/-fvisibility* fail. - if [[ $(gcc-major-version) -lt 4 ]]; then - use amd64 && myconf="${myconf} --disable-visibility" - fi - - econf ${myconf} -} - -src_compile() { - emake || die "emake failed" - - if use contrib; then - emake -C contrib/organize \ - LDFLAGS="\$(BOOST_LIBS) -L../../src -lexiv2 ${LDFLAGS}" \ - CPPFLAGS="${CPPFLAGS} -I\$(BOOST_INC_DIR) -I. -DEXV_HAVE_STDINT_H" \ - || die "emake organize failed" - fi - - if use doc; then - emake doc || die "emake doc failed" - fi -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - - if use contrib; then - emake DESTDIR="${D}" -C contrib/organize install || die "emake install organize failed" - fi - - dodoc README doc/{ChangeLog,cmd.txt} - use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} - use doc && dohtml -r doc/html/. - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins samples/*.cpp - fi -} - -pkg_postinst() { - ewarn - ewarn "PLEASE PLEASE take note of this:" - ewarn "Please make *sure* to run revdep-rebuild now" - ewarn "Certain things on your system may have linked against a" - ewarn "different version of exiv2 -- those things need to be" - ewarn "recompiled. Sorry for the inconvenience!" - ewarn -} diff --git a/media-gfx/exiv2/files/exiv2-0.21-xmp-fix.patch b/media-gfx/exiv2/files/exiv2-0.21-xmp-fix.patch deleted file mode 100644 index 5f67cc95e456..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.21-xmp-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- exiv2-0.21.orig/src/xmp.cpp 2010-11-06 13:53:15.000000000 +0000 -+++ exiv2-0.21/src/xmp.cpp 2010-12-20 12:35:34.931520681 +0000 -@@ -420,11 +420,10 @@ namespace Exiv2 { - } - } // XmpParser::registerNs - #else -- bool XmpParser::registerNs(const std::string& /*ns*/, -+ void XmpParser::registerNs(const std::string& /*ns*/, - const std::string& /*prefix*/) - { - initialize(); -- return true; - } // XmpParser::registerNs - #endif -