diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-10-18 02:27:14 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-10-18 02:28:40 +0200 |
commit | 81778186e30816cb54047015642b12e791f979ce (patch) | |
tree | a70e714359c56d1c8169d7c5bab17c33b6410c1c /media-gfx | |
parent | media-gfx/exiv2: Add 0.26_p20171018 snapshot from 0.26 branch (diff) | |
download | gentoo-81778186e30816cb54047015642b12e791f979ce.tar.gz gentoo-81778186e30816cb54047015642b12e791f979ce.tar.bz2 gentoo-81778186e30816cb54047015642b12e791f979ce.zip |
media-gfx/exiv2: Drop old snapshot
It was based on master when it was not clear there was going
to be a stable branch.
Package-Manager: Portage-2.3.11, Repoman-2.3.3
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/exiv2/Manifest | 1 | ||||
-rw-r--r-- | media-gfx/exiv2/exiv2-0.26_p20171013.ebuild | 122 | ||||
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.26_p20171013-ccache.patch | 62 | ||||
-rw-r--r-- | media-gfx/exiv2/files/exiv2-0.26_p20171013-cmake.patch | 47 |
4 files changed, 0 insertions, 232 deletions
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index 4c27da12d82c..db32671e88ef 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -1,3 +1,2 @@ DIST exiv2-0.25.tar.gz 5434325 SHA256 c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 SHA512 08d4e655ffdde715e0214f4bef01d55aba9b8ba517456a60e254a0f8541c20479e407545db28ca90a69dee8def6941fdd88f9a557fb382ebebe49e363aca8e8e WHIRLPOOL f9e7a6947dac5870e0574253b8c1cb1e7d31a916a9e1c4417c73168046c0b4bed90b9c77253444604163bcf6dca204dab92a52cb03bdcb0f85c807327623f8ac -DIST exiv2-0.26_p20171013.tar.gz 25801252 SHA256 137178f0dfc2734b174ba71b8b18d5852fcd5c6f7835eeb1b58f42b93eed7317 SHA512 4e8b10b8593a80615f5deb9fed3420f118338f1161b99c0b86456686fe8d511bb5df956ee25ed5edf990b34bab9efda64be5c80f6efbd78e6e497cb85e2a3ad5 WHIRLPOOL e32b9d98fa5be77bbf50bf275a95db8e9d15b0d40d762bdf512cb8d02f009fc452921df194121cd32d9780de1c83afd0da5cd75ef653a9ba1459f18884f71ffe DIST exiv2-0.26_p20171018.tar.gz 28370645 SHA256 7dea665ff7e58a7a858b1aa624d75f27f8b8b154cce645ef970344982c9de449 SHA512 fb4c867a5879ab46f31a1a8a7f8d24395620d6ff2a1088bc9d8d589ca110fad063e19266f4e2b75ad7bebc5b87141ed95db8e214220670a4d11092dfe654558c WHIRLPOOL b2c5060fbbb177479ffd8fbf68957d2329c0383da673b3555f602e574ee90672f55dd6105dcb25e47c9efde97dd4721d05596b22ab9f954bf9e502ffac0ee45c diff --git a/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild b/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild deleted file mode 100644 index edc5b1631383..000000000000 --- a/media-gfx/exiv2/exiv2-0.26_p20171013.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -COMMIT=269370863ecd61dd038eed3b96ecd65898d3bb6e -LINGUAS="bs de es fi fr gl ms pl pt ru sk sv ug uk vi" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -inherit cmake-multilib python-any-r1 vcs-snapshot - -DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility" -HOMEPAGE="http://www.exiv2.org/" -SRC_URI="https://github.com/Exiv2/${PN}/tarball/${COMMIT} -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/26" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="doc examples nls png webready xmp $(printf 'linguas_%s ' ${LINGUAS})" - -RDEPEND=" - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) - png? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) - webready? ( - net-libs/libssh[${MULTILIB_USEDEP}] - net-misc/curl[${MULTILIB_USEDEP}] - ) - xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] ) -" - -DEPEND="${RDEPEND} - doc? ( - ${PYTHON_DEPS} - app-doc/doxygen - dev-libs/libxslt - media-gfx/graphviz - virtual/pkgconfig - ) - nls? ( sys-devel/gettext ) -" - -DOCS=( README.md doc/ChangeLog doc/cmd.txt ) - -PATCHES=( - "${FILESDIR}/${P}-cmake.patch" - "${FILESDIR}/${P}-ccache.patch" # bug 634302 -) - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_prepare() { - if [[ ${PV} != *9999 ]] ; then - if [[ -d po ]] ; then - pushd po > /dev/null || die - local lang - for lang in *.po; do - if [[ -e ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then - case ${lang} in - CMakeLists.txt | \ - ${PN}.pot) ;; - *) rm -r ${lang} || die ;; - esac - fi - done - popd > /dev/null || die - else - die "Failed to prepare LINGUAS - po directory moved?" - fi - fi - - # FIXME @upstream: - einfo "Converting doc/cmd.txt to UTF-8" - iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die - mv -f doc/cmd.txt.tmp doc/cmd.txt || die - - if use doc; then - einfo "Updating doxygen config" - doxygen &>/dev/null -u config/Doxyfile || die - fi - - cmake-utils_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_WITH_CCACHE=OFF - -DEXIV2_BUILD_SAMPLES=OFF - -DEXIV2_BUILD_PO=$(usex nls) - -DEXIV2_ENABLE_NLS=$(usex nls) - -DEXIV2_ENABLE_PNG=$(usex png) - -DEXIV2_ENABLE_CURL=$(usex webready) - -DEXIV2_ENABLE_SSH=$(usex webready) - -DEXIV2_ENABLE_WEBREADY=$(usex webready) - -DEXIV2_ENABLE_XMP=$(usex xmp) - $(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO) - ) - - cmake-utils_src_configure -} - -multilib_src_compile() { - cmake-utils_src_compile - - if multilib_is_native_abi; then - use doc && emake -j1 doc - fi -} - -multilib_src_install_all() { - use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} ) - use doc && HTML_DOCS=( "${S}"/doc/html/. ) - - einstalldocs - find "${D}" -name '*.la' -delete || die - - if use examples; then - docinto examples - dodoc samples/*.cpp - fi -} diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20171013-ccache.patch b/media-gfx/exiv2/files/exiv2-0.26_p20171013-ccache.patch deleted file mode 100644 index ece62cedce9c..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.26_p20171013-ccache.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 9686aa8857bcd992ee4f23d20e80dfc31679f67a Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Sun, 15 Oct 2017 09:28:09 +0200 -Subject: [PATCH] Add build switch to disable auto ccache - -Current usage of ccache leads to sandbox issues. -Be able to switch it off for package managers that already can -make use of ccache for build. ---- - CMakeLists.txt | 1 + - config/findDependencies.cmake | 12 +++++++----- - config/printSummary.cmake | 1 + - 3 files changed, 9 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 80fa907c..a60d4b2e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -41,6 +41,7 @@ option( EXIV2_ENABLE_SSH "USE Libssh for SshIo" - option( EXIV2_BUILD_SAMPLES "Build sample applications" ON ) - option( EXIV2_BUILD_PO "Build translations files" OFF ) - option( EXIV2_BUILD_EXIV2_COMMAND "Build exiv2 command-line executable" ON ) -+option( BUILD_WITH_CCACHE "Use ccache to speed up compile time" ON ) - - if ( EXIV2_ENABLE_WEBREADY ) - set ( EXIV2_ENABLE_CURL ON ) -diff --git a/config/findDependencies.cmake b/config/findDependencies.cmake -index 16967763..d6af9488 100644 ---- a/config/findDependencies.cmake -+++ b/config/findDependencies.cmake -@@ -58,9 +58,11 @@ if( EXIV2_ENABLE_BUILD_PO ) - endif() - endif() - --find_program(CCACHE_FOUND ccache) --if(CCACHE_FOUND) -- message(STATUS "Program ccache found") -- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) -- set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) -+if( BUILD_WITH_CCACHE ) -+ find_program(CCACHE_FOUND ccache) -+ if(CCACHE_FOUND) -+ message(STATUS "Program ccache found") -+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) -+ set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) -+ endif() - endif() -diff --git a/config/printSummary.cmake b/config/printSummary.cmake -index 21e444a4..62ba4e98 100644 ---- a/config/printSummary.cmake -+++ b/config/printSummary.cmake -@@ -40,6 +40,7 @@ endif() - OptionOutput( "Building exiv2 command: " EXIV2_BUILD_EXIV2_COMMAND ) - OptionOutput( "Building samples: " EXIV2_BUILD_SAMPLES ) - OptionOutput( "Building PO files: " EXIV2_BUILD_PO ) -+OptionOutput( "Using ccache: " BUILD_WITH_CCACHE ) - - - message( STATUS "------------------------------------------------------------------" ) --- -2.14.2 - diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20171013-cmake.patch b/media-gfx/exiv2/files/exiv2-0.26_p20171013-cmake.patch deleted file mode 100644 index c10f125415b2..000000000000 --- a/media-gfx/exiv2/files/exiv2-0.26_p20171013-cmake.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 57883ee664260f5a1b382575e7477ad34c86ce7d Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Fri, 13 Oct 2017 18:54:11 +0200 -Subject: [PATCH] Fix build with EXIV2_BUILD_EXIV2_COMMAND=OFF - ---- - src/CMakeLists.txt | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index fe49a0a6..f75cbf1b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -291,21 +291,28 @@ if(EXIV2_BUILD_EXIV2_COMMAND) - if ( BUILD_SHARED_LIBS ) - target_compile_definitions(exiv2 PRIVATE EXV_HAVE_DLL ) - endif() -+ # modify source lists to suit environment -+ -+ # TODO This should not be needed here! we need to fix the previous TODO -+ target_include_directories(exiv2 PRIVATE ${CMAKE_SOURCE_DIR}/include/) -+ -+ if(NOT EXV_HAVE_TIMEGM ) -+ target_sources(exiv2 PRIVATE localtime.c) -+ endif() -+ -+ if (MSVC) -+ target_sources(exiv2 PRIVATE getopt_win32.c) -+ endif() - install(TARGETS exiv2 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif() - --# TODO This should not be needed here! we need to fix the previous TODO --target_include_directories(exiv2 PRIVATE ${CMAKE_SOURCE_DIR}/include/) -- - # modify source lists to suit environment - if(NOT EXV_HAVE_TIMEGM ) - target_sources(exiv2lib PRIVATE localtime.c) -- target_sources(exiv2 PRIVATE localtime.c) - endif() - - if (MSVC) - target_sources(exiv2lib PRIVATE getopt_win32.c) -- target_sources(exiv2 PRIVATE getopt_win32.c) - endif() - - # ****************************************************************************** |