diff options
author | Stefan Briesenick <sbriesen@gentoo.org> | 2011-04-02 23:46:37 +0000 |
---|---|---|
committer | Stefan Briesenick <sbriesen@gentoo.org> | 2011-04-02 23:46:37 +0000 |
commit | f6eeb31796770353330f1da9cb6ac9ef27d85766 (patch) | |
tree | ddaed4f02bfe2adbcba0de4469778a95c77f1866 /media-gfx | |
parent | Version bump. (diff) | |
download | historical-f6eeb31796770353330f1da9cb6ac9ef27d85766.tar.gz historical-f6eeb31796770353330f1da9cb6ac9ef27d85766.tar.bz2 historical-f6eeb31796770353330f1da9cb6ac9ef27d85766.zip |
version bump (bug #358161) + boost fixes (bug #357605)
Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/exiv2/ChangeLog | 9 | ||||
-rw-r--r-- | media-gfx/exiv2/Manifest | 4 | ||||
-rw-r--r-- | media-gfx/exiv2/exiv2-0.21.1.ebuild | 123 |
3 files changed, 133 insertions, 3 deletions
diff --git a/media-gfx/exiv2/ChangeLog b/media-gfx/exiv2/ChangeLog index 8714836c123e..59c51d056a5f 100644 --- a/media-gfx/exiv2/ChangeLog +++ b/media-gfx/exiv2/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-gfx/exiv2 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.91 2010/12/21 12:31:54 sbriesen Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.92 2011/04/02 23:46:37 sbriesen Exp $ + +*exiv2-0.21.1 (02 Apr 2011) + + 02 Apr 2011; Stefan Briesenick <sbriesen@gentoo.org> +exiv2-0.21.1.ebuild: + version bump (bug #358161) + boost fixes (bug #357605) *exiv2-0.21-r1 (21 Dec 2010) diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index aae17abbeebc..efdb5fa40e6c 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -2,10 +2,12 @@ AUX exiv2-0.19-syntax-fix.patch 598 RMD160 f59d55322ee8d945bc1a604d28952269a7fa6 AUX exiv2-0.21-xmp-fix.patch 496 RMD160 f36938d4f8df339f926c3c8eba0db91303e67e0d SHA1 abed499570778289b690ace670a08bd77ff13487 SHA256 2fdca07d3affdc53a60ab85341c6a8cb271713a6f691a6310234e03e562114b6 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.ebuild 3392 RMD160 2e0d17754b82caadf863c3582ceddc8c80e5de57 SHA1 736af89964c0b3b6208e890bb61f7db336f584b3 SHA256 710a0976fc6a7401d9e23a992b63ecabe59dec1f490d98cb03cde21a780bbd8b EBUILD exiv2-0.21.ebuild 2976 RMD160 04320c7d430172dd05f9632f0ebfa567a492fcde SHA1 a6cac9b57e9c25269082055b1cecf08d1fd7b2b6 SHA256 7722ca355cf1f0690e0ffd06c527cf61c3a7d105559af13a3798367f70112636 -MISC ChangeLog 11168 RMD160 5fd813e873638168dcebcd3759e1b1ff18a37989 SHA1 8491162d5a466ba604788e67c354ed7e478b28bd SHA256 300e0a2d1d1cef2e649e3e12ffc5e40c8f8d3d15931124e12a31076e9a2c64e8 +MISC ChangeLog 11332 RMD160 167ec865d720fa842384f7f47ba90b874e113f74 SHA1 a50aaeaebb89b303b126043ac55a14a24f15482a SHA256 826f5a5d58329b24503a5cc5a08eef43fa6072189c0af15a4c82fb0f556fb630 MISC metadata.xml 499 RMD160 977e5210d3b213c9c743a476d77737af81ca805a SHA1 1784af211aba78b938559b591cd6d6d3bae0427f SHA256 d536220947772cba94e4d08e8da8139987413ded44f779e62165ea308bffb5ff diff --git a/media-gfx/exiv2/exiv2-0.21.1.ebuild b/media-gfx/exiv2/exiv2-0.21.1.ebuild new file mode 100644 index 000000000000..ebba2543b62a --- /dev/null +++ b/media-gfx/exiv2/exiv2-0.21.1.ebuild @@ -0,0 +1,123 @@ +# 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 $ + +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() { + # exiv2 fails to build with boost-1.46 due to boost filesystem + # API v3 becoming the default. This is easily fixed by adding a + # #define BOOST_FILESYSTEM_VERSION 2 + # to source files that include boost/filesystem.hpp + # + # Implemented via sed to avoid patch-file (bug #357605) + sed -i -e \ + 's|^\(#include <boost/filesystem.hpp>.*\)|#define BOOST_FILESYSTEM_VERSION 2\n\1|g' \ + contrib/organize/helpers.hpp + + # 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 +} |