| 1 |
mgorny 14/04/30 14:28:30 |
| 2 |
|
| 3 |
Modified: exiv2-0.23-r2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix multilib and Python support. Bug #474654. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 media-gfx/exiv2/exiv2-0.23-r2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/exiv2/exiv2-0.23-r2.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/exiv2/exiv2-0.23-r2.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/exiv2/exiv2-0.23-r2.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: exiv2-0.23-r2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.23-r2.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- exiv2-0.23-r2.ebuild 22 Dec 2013 12:18:11 -0000 1.2 |
| 23 |
+++ exiv2-0.23-r2.ebuild 30 Apr 2014 14:28:29 -0000 1.3 |
| 24 |
@@ -1,11 +1,12 @@ |
| 25 |
-# Copyright 1999-2013 Gentoo Foundation |
| 26 |
+# Copyright 1999-2014 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.23-r2.ebuild,v 1.2 2013/12/22 12:18:11 johu Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.23-r2.ebuild,v 1.3 2014/04/30 14:28:29 mgorny Exp $ |
| 30 |
|
| 31 |
EAPI=5 |
| 32 |
- |
| 33 |
+AUTOTOOLS_IN_SOURCE_BUILD=1 |
| 34 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
| 35 |
-inherit eutils multilib toolchain-funcs python-single-r1 autotools-multilib |
| 36 |
+ |
| 37 |
+inherit eutils multilib toolchain-funcs python-any-r1 autotools-multilib |
| 38 |
|
| 39 |
DESCRIPTION="EXIF and IPTC metadata C++ library and command line utility" |
| 40 |
HOMEPAGE="http://www.exiv2.org/" |
| 41 |
@@ -18,10 +19,10 @@ |
| 42 |
IUSE="contrib doc examples nls xmp zlib static-libs $(printf 'linguas_%s ' ${IUSE_LINGUAS})" |
| 43 |
|
| 44 |
RDEPEND=" |
| 45 |
- virtual/libiconv |
| 46 |
- nls? ( virtual/libintl ) |
| 47 |
- xmp? ( dev-libs/expat ) |
| 48 |
- zlib? ( sys-libs/zlib ) |
| 49 |
+ virtual/libiconv[${MULTILIB_USEDEP}] |
| 50 |
+ nls? ( virtual/libintl[${MULTILIB_USEDEP}] ) |
| 51 |
+ xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] ) |
| 52 |
+ zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) |
| 53 |
" |
| 54 |
|
| 55 |
DEPEND="${RDEPEND} |
| 56 |
@@ -31,13 +32,17 @@ |
| 57 |
dev-libs/libxslt |
| 58 |
virtual/pkgconfig |
| 59 |
media-gfx/graphviz |
| 60 |
- ${PYTHON_DEPEND} |
| 61 |
+ ${PYTHON_DEPS} |
| 62 |
) |
| 63 |
nls? ( sys-devel/gettext ) |
| 64 |
" |
| 65 |
|
| 66 |
DOCS=( README doc/ChangeLog doc/cmd.txt ) |
| 67 |
|
| 68 |
+pkg_setup() { |
| 69 |
+ use doc && python-any-r1_pkg_setup |
| 70 |
+} |
| 71 |
+ |
| 72 |
src_prepare() { |
| 73 |
# convert docs to UTF-8 |
| 74 |
local i |
| 75 |
@@ -49,7 +54,6 @@ |
| 76 |
if use doc; then |
| 77 |
einfo "Updating doxygen config" |
| 78 |
doxygen 2>&1 >/dev/null -u config/Doxyfile |
| 79 |
- python_convert_shebangs -r 2 doc/templates |
| 80 |
fi |
| 81 |
|
| 82 |
if use contrib; then |
| 83 |
@@ -59,16 +63,16 @@ |
| 84 |
ln -snf ../../src contrib/organize/exiv2 |
| 85 |
sed -i -e 's:/usr/local/include/.*:/usr/include:g' \ |
| 86 |
-e 's:/usr/local/lib/lib:-l:g' -e 's:-gcc..-mt-._..\.a::g' \ |
| 87 |
- contrib/organize/boost.mk |
| 88 |
+ contrib/organize/boost.mk || die |
| 89 |
fi |
| 90 |
|
| 91 |
# set locale to safe value for the sed commands (bug #382731) |
| 92 |
- sed -i -r "s,(\s+)sed\s,\1LC_ALL="C" sed ,g" src/Makefile |
| 93 |
+ sed -i -r "s,(\s+)sed\s,\1LC_ALL="C" sed ,g" src/Makefile || die |
| 94 |
|
| 95 |
- multilib_copy_sources |
| 96 |
+ autotools-multilib_src_prepare |
| 97 |
} |
| 98 |
|
| 99 |
-src_configure() { |
| 100 |
+multilib_src_configure() { |
| 101 |
local myeconfargs=( |
| 102 |
$(use_enable nls) |
| 103 |
$(use_enable xmp) |
| 104 |
@@ -76,38 +80,47 @@ |
| 105 |
) |
| 106 |
|
| 107 |
# plain 'use_with' fails |
| 108 |
- use zlib || myeconfargs+=("${myconf} --without-zlib") |
| 109 |
+ use zlib || myeconfargs+=( --without-zlib ) |
| 110 |
|
| 111 |
# Bug #78720. amd64/gcc-3.4/-fvisibility* fail. |
| 112 |
- if [ $(gcc-major-version) -lt 4 ]; then |
| 113 |
- use amd64 && myeconfargs+=("${myconf} --disable-visibility") |
| 114 |
+ if [[ ${ABI} == amd64 && $(gcc-major-version) -lt 4 ]]; then |
| 115 |
+ myeconfargs+=( --disable-visibility ) |
| 116 |
fi |
| 117 |
|
| 118 |
- autotools-multilib_src_configure |
| 119 |
+ autotools-utils_src_configure |
| 120 |
} |
| 121 |
|
| 122 |
-src_compile() { |
| 123 |
- autotools-multilib_src_compile |
| 124 |
+multilib_src_compile() { |
| 125 |
+ emake |
| 126 |
|
| 127 |
- if use contrib; then |
| 128 |
- autotools-multilib_src_compile -C contrib/organize \ |
| 129 |
- LDFLAGS="\$(BOOST_LIBS) -L../../src -lexiv2 ${LDFLAGS}" \ |
| 130 |
- CPPFLAGS="${CPPFLAGS} -I\$(BOOST_INC_DIR) -I. -DEXV_HAVE_STDINT_H" |
| 131 |
- fi |
| 132 |
+ if multilib_is_native_abi; then |
| 133 |
+ if use contrib; then |
| 134 |
+ emake -C contrib/organize \ |
| 135 |
+ LDFLAGS="\$(BOOST_LIBS) -L../../src -lexiv2 ${LDFLAGS}" \ |
| 136 |
+ CPPFLAGS="${CPPFLAGS} -I\$(BOOST_INC_DIR) -I. -DEXV_HAVE_STDINT_H" |
| 137 |
+ fi |
| 138 |
|
| 139 |
- use doc && multilib_for_best_abi emake doc |
| 140 |
+ use doc && emake doc |
| 141 |
+ fi |
| 142 |
} |
| 143 |
|
| 144 |
-src_install() { |
| 145 |
- autotools-multilib_src_install |
| 146 |
+multilib_src_install() { |
| 147 |
+ autotools-utils_src_install |
| 148 |
|
| 149 |
- if use contrib; then |
| 150 |
- autotools-multilib_src_install -C contrib/organize \ |
| 151 |
- DESTDIR="${D}" install |
| 152 |
+ if multilib_is_native_abi; then |
| 153 |
+ if use contrib; then |
| 154 |
+ emake DESTDIR="${D}" -C contrib/organize install |
| 155 |
+ fi |
| 156 |
+ |
| 157 |
+ use doc && dohtml -r doc/html/. |
| 158 |
fi |
| 159 |
+} |
| 160 |
+ |
| 161 |
+multilib_src_install_all() { |
| 162 |
+ einstalldocs |
| 163 |
+ prune_libtool_files --all |
| 164 |
|
| 165 |
use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} |
| 166 |
- use doc && multilib_for_best_abi dohtml -r doc/html/. |
| 167 |
if use examples; then |
| 168 |
insinto /usr/share/doc/${PF}/examples |
| 169 |
docompress -x /usr/share/doc/${PF}/examples |
| 170 |
|
| 171 |
|
| 172 |
|
| 173 |
1.120 media-gfx/exiv2/ChangeLog |
| 174 |
|
| 175 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/exiv2/ChangeLog?rev=1.120&view=markup |
| 176 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/exiv2/ChangeLog?rev=1.120&content-type=text/plain |
| 177 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/exiv2/ChangeLog?r1=1.119&r2=1.120 |
| 178 |
|
| 179 |
Index: ChangeLog |
| 180 |
=================================================================== |
| 181 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v |
| 182 |
retrieving revision 1.119 |
| 183 |
retrieving revision 1.120 |
| 184 |
diff -u -r1.119 -r1.120 |
| 185 |
--- ChangeLog 22 Dec 2013 12:18:11 -0000 1.119 |
| 186 |
+++ ChangeLog 30 Apr 2014 14:28:29 -0000 1.120 |
| 187 |
@@ -1,6 +1,9 @@ |
| 188 |
# ChangeLog for media-gfx/exiv2 |
| 189 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 190 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.119 2013/12/22 12:18:11 johu Exp $ |
| 191 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 192 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.120 2014/04/30 14:28:29 mgorny Exp $ |
| 193 |
+ |
| 194 |
+ 30 Apr 2014; Michał Górny <mgorny@g.o> exiv2-0.23-r2.ebuild: |
| 195 |
+ Fix multilib and Python support. Bug #474654. |
| 196 |
|
| 197 |
22 Dec 2013; Johannes Huber <johu@g.o> exiv2-0.23-r2.ebuild: |
| 198 |
Fix src_install with USE contrib by Rafał Mużyło <galtgendo@××.pl>, bug |
Archives