summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Stakenvicius <axs@gentoo.org>2014-11-06 18:27:42 +0000
committerIan Stakenvicius <axs@gentoo.org>2014-11-06 18:27:42 +0000
commitdda06800ad8d9c9a2b0856903240f92a54702c00 (patch)
treee95f60a9d7094221d1d9b12b80fcf2e8c3df2045 /media-libs/libgphoto2
parentEAPI revbump (diff)
downloadhistorical-dda06800ad8d9c9a2b0856903240f92a54702c00.tar.gz
historical-dda06800ad8d9c9a2b0856903240f92a54702c00.tar.bz2
historical-dda06800ad8d9c9a2b0856903240f92a54702c00.zip
Fixed libltdl / libtool dependencies, bug 528206
Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64 RepoMan-Options: --force Manifest-Sign-Key: 0x2B6559ED
Diffstat (limited to 'media-libs/libgphoto2')
-rw-r--r--media-libs/libgphoto2/ChangeLog10
-rw-r--r--media-libs/libgphoto2/Manifest12
-rw-r--r--media-libs/libgphoto2/libgphoto2-2.5.4-r2.ebuild (renamed from media-libs/libgphoto2/libgphoto2-2.5.4-r1.ebuild)9
-rw-r--r--media-libs/libgphoto2/libgphoto2-2.5.5.1-r1.ebuild (renamed from media-libs/libgphoto2/libgphoto2-2.5.5.1.ebuild)9
4 files changed, 27 insertions, 13 deletions
diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index d42945ad61d4..7c292473c846 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for media-libs/libgphoto2
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.269 2014/11/02 16:01:03 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.270 2014/11/06 18:27:31 axs Exp $
+
+*libgphoto2-2.5.4-r2 (06 Nov 2014)
+*libgphoto2-2.5.5.1-r1 (06 Nov 2014)
+
+ 06 Nov 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+ +libgphoto2-2.5.4-r2.ebuild, +libgphoto2-2.5.5.1-r1.ebuild,
+ -libgphoto2-2.5.4-r1.ebuild, -libgphoto2-2.5.5.1.ebuild:
+ Fixed libltdl / libtool dependencies, bug 528206
*libgphoto2-2.5.5.1 (02 Nov 2014)
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 7cdde318ae17..b8ce26920fa7 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -6,15 +6,15 @@ DIST libgphoto2-2.5.3.1.tar.bz2 6676451 SHA256 29322d3b163d1d91501280259ca16d1ba
DIST libgphoto2-2.5.4.tar.bz2 6682743 SHA256 5fb412e28d3a8ed15bfe86df2173360fcccd29f3d2117e8329d827c356e60bc0 SHA512 04494918aedb4dcb1b7d57a5756b9a00366f87034d1c622dfaeb129fa7988974f3abba31f5acdd1f9041aaaf55a301128c906242610b6f5cb1796451240be9d5 WHIRLPOOL 173e3a0db98c06426a91a78e72e35618dc4cea095461d37e37826a96f14d53a32fa1074a67208b7f983396e36fe950264751ec52ddb6389b7b7c6c00287aff23
DIST libgphoto2-2.5.5.1.tar.bz2 6699687 SHA256 600e6bde24545eef4d2d8285af389a5ae738707becb018c78611b2d8a3054846 SHA512 a274bb553abed2f498b28388b2e2bc1810b4f57823744e7461248020818f1b79430198d81091aaa8ddc18a2a2acc5acf4fce5800e80da5e7ba534f0c094c749a WHIRLPOOL 8831627d38a0d53eecc8cbbd54595f7c0eff93a6b78ba40b1651b36d843c1bb973e8ce07ebeba0bffd3dafe4302abcd2512472b76c3225fedc1df4c827aa5190
EBUILD libgphoto2-2.5.3.1.ebuild 6459 SHA256 1bf31a1078e387f91446ee3a0d638d7e72799809fb76223ca1ba7f1ea5b2339d SHA512 357b620e7d1df2b7aea958aa2956e81ad8414c86babea5793ebf45cd5746a53322a6300dc40ea5063bb2e6a3972f28ae0b469e82fd5bad44ce44b0783b7fc768 WHIRLPOOL 80b34527146ce065f52206d433ee38528dc4dc763f19bfb78488e348ba6c40a20a8b0e4cf595e4c81380073f6b643a31df5578b58e51180cfff2fcea588bc622
-EBUILD libgphoto2-2.5.4-r1.ebuild 7320 SHA256 d95be7c69b86741ea95605d3476772f731324c49be4e36589ed5e57ed28af127 SHA512 69069e1780ea1236a884e06a117f69fc63316807e375b742b48c11d1ffdffabae8ff91d7308f502673d8ea01ad4182c12724608a60a08b6c58963ffef4483d86 WHIRLPOOL 5cbfe15efa430448d5a64171191d84dfe81f54670ac104206b58a053933a4392947ec6b3463826529ce0652a870e45f9a21bc7fc81e7766a1f46672fe472da0e
+EBUILD libgphoto2-2.5.4-r2.ebuild 7416 SHA256 234323578d8e4c6f0a2dff42ebc35bb393fe5c2bc9fa6863d4ab2dac0554b45e SHA512 dc14f7199c3fba3c708afe05af434ee618ea9224d2c5bb9c95e0ab2880d3171ffb20603cec87a16ece43435162bbe912aa9f0ceafaffc3620141fb637edbd077 WHIRLPOOL d63730e7e69656f522e0d79f4f149d50757d60e7132e49e14d76b2598907bf1e46cb5eeaf7e6c70d8ff97d1b40a9f51ea01bde3d7be8e997aac5eefb282b5398
EBUILD libgphoto2-2.5.4.ebuild 6701 SHA256 12d2a0cf6addc8b138e8403fd987fa637d9717300c7839a0126fe79cc25c3451 SHA512 575cb95deadce8acababe9a9b51d5d807887a7ad89a0d5d2fba96b1ef6dc435081ab67df306fac9b34599506bc57af28674da7a584b345ad3d24136d2e465ac9 WHIRLPOOL 19c850f2f2d100935554b5cf3bac51621a9fe3fca4c6d6f3e52a0ffa67224f79c89d6784e1becfb439d3a3ccb9e65504fcb41c979ae61cde7e4f002085655a0a
-EBUILD libgphoto2-2.5.5.1.ebuild 7229 SHA256 127c4d0948744d285440ebddf36320f2d17bd2298b2229405090106dcbdbf879 SHA512 c7432e6ead751bd55102d4a071e134cb2b704a2fe3c1c2d5f91a216e3818cc02a2ad8285e37a626e52aedf03f904febb4e3d0409e9904e726de66eef97751c1e WHIRLPOOL 253004e9d3b420faab04eecf74e608da79e0a47452bbf94f96fb402f6cead36b423993074c6876ee17ea21b09cdcff45d1ea61d9c9d958176dbcfd1e2b3d9279
-MISC ChangeLog 42855 SHA256 1e5b8c8b437bf9cfdb76224ce325b090ce0b6fd4c43721faf168dea68c7f2d8c SHA512 ce159adf796fa40b886413593e3bb2fe75ccd496965a1c86ddcbf2d3cb3364d8c66f4c4d3c6f610520f2321c3f6959c7b3caf72fdfd1a6b999e8c5895f06582f WHIRLPOOL c1f06d9d78e44e00d54b0d75ed5af6e8637ba107642128457b01383559135e8c1a8f35bd1521f6f7caac3116fdc8c9dfb0b1f882ea4974fb852d75e14435e3c4
+EBUILD libgphoto2-2.5.5.1-r1.ebuild 7329 SHA256 1272116ee968b331405aa35b2bda93f49000f63320fc1e23774006940569be0a SHA512 f3abea3dc6871963fdd1389f374d3012e4ac78c807f08b75425fbe467259beed19dec41d9e15f13bfc7737bf655712289a1770e7de86b5387dc6c9109e9467c6 WHIRLPOOL 6aebee3fa48e5cef9cdb70dfa42bdec446a14d1dc2e974caa941f11f15a7ebac68e35c733b8f1a9dbe6ec62de2747e994b3d876847b5c0d4bd854f2700be084d
+MISC ChangeLog 43158 SHA256 3b678bd83285d542877caea3c3b17d8818c99ae2947952f234ff13530ce8c22d SHA512 35ff6f754e795af40d27cf671fb49ce96c695b6d06f664156bbc870b681be041dda594c1a09d143e16672dee5e92466ca1581aafd33bbb53bff41978efa5348e WHIRLPOOL aaba05d8afc70a43dad349c536b4c220cff7d48d102e0d38a5023ecd60cbfba3842f925f7d36b8d93552c3c36dcdfeb7d15b09296636ca479f7058fc4523bfc6
MISC metadata.xml 253 SHA256 d588fba550907efea387719a7a12f54e6c0ec2ca03864f9f5cf828d26fdd0e4a SHA512 810bb24e1fadd707df227dc11b1a04f25e102364dc8a709e0a082a539081afef56beb2618e2e38ed5d0c7f34c8bda966035c6ad25598ced1ddd5202260cc8079 WHIRLPOOL 0773381f0be58cda0a2ecdca7cb89638cce7b1dc774e2c13500ff43d42f8c8c771e00cc91433ddc7e1213be6267f3ad02981dd20e11590371935d02a49247b2f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlRWVUAACgkQ1fmVwcYIWAYAzgCgk/GxJjVewFuQRpRR5c/LSq59
-mCsAmwYyBF4kni1xmXYEILNxFFSqCP5b
-=6MSX
+iF4EAREIAAYFAlRbvaMACgkQ2ugaI38ACPBhJwD/fHBSRFM3/5JCl0Ca5pZB2Ykv
+Nf5rqUypG9N8SaSrD8wA/16sMaS2Op35wPqaW+8RXqFnOxqc5pMYvq/Ui0SVkT+J
+=ET0Z
-----END PGP SIGNATURE-----
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.4-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.4-r2.ebuild
index 286db37c6cbb..c35aba33a4fd 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.4-r1.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.4-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.4-r1.ebuild,v 1.11 2014/09/15 08:21:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.4-r2.ebuild,v 1.1 2014/11/06 18:27:31 axs Exp $
# TODO
# 1. Track upstream bug --disable-docs does not work.
@@ -48,10 +48,13 @@ for camera in ${IUSE_CAMERAS}; do
IUSE="${IUSE} cameras_${camera}"
done
-# libgphoto2 actually links to libtool
+# libgphoto2 actually links to libltdl, leave old libtool multilib dep there for now
RDEPEND="
>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
- >=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
+ || (
+ dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+ >=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
+ )
>=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.5.1.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.5.1-r1.ebuild
index 7208531c98fe..5d1add4224d7 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.5.1.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.5.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.5.1.ebuild,v 1.1 2014/11/02 16:01:03 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.5.1-r1.ebuild,v 1.1 2014/11/06 18:27:31 axs Exp $
# TODO
# 1. Track upstream bug --disable-docs does not work.
@@ -48,10 +48,13 @@ for camera in ${IUSE_CAMERAS}; do
IUSE="${IUSE} cameras_${camera}"
done
-# libgphoto2 actually links to libtool
+# libgphoto2 actually links to libltdl, leave old libtool multilib dep there for now
RDEPEND="
>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
- >=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
+ || (
+ dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+ >=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
+ )
>=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )