From: Pacho Ramos Date: Mon, 26 Jan 2015 11:39:26 +0000 (+0000) Subject: Version bump, drop .la files (upstream confirmed they are not needed: https://sourcef... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=75a0e35d8d7c46d3a1e1c47633175d9d7418a9e0;p=gentoo.git Version bump, drop .la files (upstream confirmed they are not needed: https://sourceforge.net/p/gphoto/bugs/1004/ ), drop old. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4 --- diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog index 330bc25e8f08..26e2755b1d46 100644 --- a/media-libs/libgphoto2/ChangeLog +++ b/media-libs/libgphoto2/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-libs/libgphoto2 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.278 2015/01/02 12:10:14 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.279 2015/01/26 11:39:25 pacho Exp $ + +*libgphoto2-2.5.7 (26 Jan 2015) + + 26 Jan 2015; Pacho Ramos +libgphoto2-2.5.7.ebuild, + -files/libgphoto2-2.4.7-respect-bonjour.patch, -libgphoto2-2.5.3.1.ebuild, + -libgphoto2-2.5.4-r2.ebuild, -libgphoto2-2.5.4.ebuild: + Version bump, drop .la files (upstream confirmed they are not needed: + https://sourceforge.net/p/gphoto/bugs/1004/ ), drop old. 02 Jan 2015; Agostino Sarubbo libgphoto2-2.5.5.1-r1.ebuild: Stable for alpha, wrt bug #529964 diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest index 7c970d88a14b..914b3fd80efe 100644 --- a/media-libs/libgphoto2/Manifest +++ b/media-libs/libgphoto2/Manifest @@ -1,30 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX libgphoto2-2.4.7-respect-bonjour.patch 643 SHA256 00b09825d9b6493a2a65577c6bf0b2a5549c6901b8b5fb839f886d989e29c055 SHA512 c6e07ffdfc8f81cee8624ce67df0480ca2fa98df1748906393ca196c73e11a482e62f59d1eb5bedc05ea3bb754ffdf4c23f4ed7f3a9d9264fbf81ed6554f4ead WHIRLPOOL 09a39eda0a3d40a8402b5483aa24d567b0da53926c7fcd85aebaca4a2510020fd8b273405d8407815f27ca1c57ab734565fe6b11fff158c9909391021c1008f2 -DIST libgphoto2-2.5.3.1.tar.bz2 6676451 SHA256 29322d3b163d1d91501280259ca16d1ba966e7d11739d8dc7cf07ef5e617cda2 SHA512 86dc8848103ead23e950d9e3cfd19bec14acc3ee654431731f07c9518c439c8d7d24f832e623d23f3eef0fb554641fa3da9f8ac5b8db99ee00ccf3aa478f4a6f WHIRLPOOL 7da218fe99d1d359277041f539e75032f3926178590f7b8ffb0c908e06f3c8367f160ccf730a3aadb0fe45e3687c792a086d514f03c34f05e189e1c2091d7243 -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-r2.ebuild 7416 SHA256 234323578d8e4c6f0a2dff42ebc35bb393fe5c2bc9fa6863d4ab2dac0554b45e SHA512 dc14f7199c3fba3c708afe05af434ee618ea9224d2c5bb9c95e0ab2880d3171ffb20603cec87a16ece43435162bbe912aa9f0ceafaffc3620141fb637edbd077 WHIRLPOOL d63730e7e69656f522e0d79f4f149d50757d60e7132e49e14d76b2598907bf1e46cb5eeaf7e6c70d8ff97d1b40a9f51ea01bde3d7be8e997aac5eefb282b5398 -EBUILD libgphoto2-2.5.4.ebuild 6701 SHA256 12d2a0cf6addc8b138e8403fd987fa637d9717300c7839a0126fe79cc25c3451 SHA512 575cb95deadce8acababe9a9b51d5d807887a7ad89a0d5d2fba96b1ef6dc435081ab67df306fac9b34599506bc57af28674da7a584b345ad3d24136d2e465ac9 WHIRLPOOL 19c850f2f2d100935554b5cf3bac51621a9fe3fca4c6d6f3e52a0ffa67224f79c89d6784e1becfb439d3a3ccb9e65504fcb41c979ae61cde7e4f002085655a0a +DIST libgphoto2-2.5.7.tar.bz2 6726164 SHA256 7260193277bdb4c319dd8f151224f87deac9fde64cbe5d2eb25d9c19e4d09894 SHA512 eaff704eb4ccfc6f7a2890c6583ece268005d91acbf8c5e192e2ac91e5a2f5f4f6c84b4dfc95773a6e6023fb12cb0e63d75eed8cd4f8a98019069ac6ab4e60f1 WHIRLPOOL 87a2fa5bbff780dce0131bcca90169bc4c273a42f4b99f2d614accba42284c1a6087ff4b1dbc6bdf139b88b95df6e4367404c873ac27b8388e594af2959dd563 EBUILD libgphoto2-2.5.5.1-r1.ebuild 7321 SHA256 59cc84d2a2f7ce7ee311b5d9e8f5c52a830f926c6bfb627b20bccdbfe210397b SHA512 0b3dc9883979c33035fec0787bb785ca6cc2bfaf90566aa284bc9e8c7f5c15e8c41014ede8f9d4cd9827bd5ba9435d2b43946fad9a58988ae3e96707ab5248d0 WHIRLPOOL 64f1b487fc3e1b2bd30a1b80aec6479b13893986ffef45d0c31089d735816ecd09f1e5b577908823904bc800769581321c86863b62e62ffe3510183e38c8f246 -MISC ChangeLog 44052 SHA256 e7a461913b894c1342945059a53f245f852073e42f951eb27b9fc9186fe25fa7 SHA512 452e9532cb9a68534d457c4536411924e69a5ee63c3975a7bfbc0e9447b1573c4fa8bf2c7a71bab6fbcf2d55be3894f931284d7cc4ecf8fe8cd8fb77e718b25b WHIRLPOOL 97995eeefb8dbcc2e65f1c56cc6cba6b1ead8486c11abf0f692577356b03a5a3d97e0897abf298e72429753fbbf214e1bffdedaa6ccf00a89d8b28d3a95161b3 +EBUILD libgphoto2-2.5.7.ebuild 6729 SHA256 dcc911936dd791f9612da83e863d5e98b4011d0b7e01727dc1a2e306ece37dc5 SHA512 8f00b6f9e178cef121f03e5472f64e0b496a7ed86df5fe637c814cef79c46cc7aeaa17a1f00eb81b9b93ec1bdfa335e51239c24203f733fe48c397c97c5eeeb7 WHIRLPOOL b8d1fc6474f5c47bfde9f4e3df2593c044e0974076fefa7fb1d09dbb4242da446a888c12d4824e17ef32208c346613cbc2ca17774e8024d2e18daf3aa893f699 +MISC ChangeLog 44425 SHA256 d76fc26814bc03a2c934dac097f6232841cf17bf01305451607e9adce9843573 SHA512 c5cd87c813ef24046051e5ef582046bd6db691d69614f39c89166c973c54181f4fff9db1ac3a872c40e2277c44e5c634a9b52cdc184cbf83cf15ddc8bfb7ddde WHIRLPOOL 28e3e54c91ec962aea0c33a34485bca48ceca3e4e0f29a4ed4f5b02ee56b72277df2c6a4c56ab032d296c6eb07c2c8ff9c37c484547743371ad6ec745215b221 MISC metadata.xml 253 SHA256 d588fba550907efea387719a7a12f54e6c0ec2ca03864f9f5cf828d26fdd0e4a SHA512 810bb24e1fadd707df227dc11b1a04f25e102364dc8a709e0a082a539081afef56beb2618e2e38ed5d0c7f34c8bda966035c6ad25598ced1ddd5202260cc8079 WHIRLPOOL 0773381f0be58cda0a2ecdca7cb89638cce7b1dc774e2c13500ff43d42f8c8c771e00cc91433ddc7e1213be6267f3ad02981dd20e11590371935d02a49247b2f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUpoqnAAoJELp701BxlEWfNdUP/0plgdHPo9SXdKG6N14hHXcP -6+MeSyonmZuj4TbCaVXWc16QZYWMWNZgAOADuXz5amUVD16En50Ye52+eYa0UqEu -JSsMfGH6AQD4SVejxQh79AoWKXT2uT829z0Q/5uDg1eRioMBMNKUfRiF/pZXe9uq -Wz0Sa8NxyjKVVAEa4v7NrmOci0PXbfMb82shj0OH79uhKGtTnkbDRmpLr6FnaOdT -AIbwci4bis8ZW6EeDZ1LEvrsNc/XoKN4vOsPVpmBgzk4TEqiR6ySdKF1vsEdrtv6 -/LQLbxQH9ne4mY7fPghazHLBf/fTQq5FHAPu8Tfy8O40oya56z2zrwcIc6Maj30K -XNaIioDjQJ4fOEuJyG/NJ7N1uuLNUtQST42O62VAkalXQEUHV8JadBCOrEmotdjJ -oewtxfphd6vwtMb2UBiDYVN75YCgggqVsdTkFwkQdwtqS/EKQc/JDPd9ulfKRVYd -fhLg0/ChDSCXaUafae5/jlW/a0iBgR87YIxrXWY1rLxSlStFYfgffAhtQ56XctSP -10Qiiwucp7SGQ/p+itveOqC8yd4kWRr/q9xkfq8ED0tjySQwSpy9CVFutRKr9JiD -uPbX5SXDHrpzvr7yB8UAZXxjj0komFKn3fg1IkvbyZrvHeETRhP5lRISv+8yz7Q/ -NelUK9CG97eptWqPVaFP -=s1NF +iEYEAREIAAYFAlTGJ24ACgkQCaWpQKGI+9TYvACcCFAtNr0Z6QxFZ+fOEsJU6/GZ +ydoAoIB0dGtqXW69YVEiauUVXtkpw/Vw +=4aGn -----END PGP SIGNATURE----- diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.7-respect-bonjour.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.7-respect-bonjour.patch deleted file mode 100644 index fc10aec0c9fe..000000000000 --- a/media-libs/libgphoto2/files/libgphoto2-2.4.7-respect-bonjour.patch +++ /dev/null @@ -1,12 +0,0 @@ -# Make sure with_bonjour value gets set by corresponding AC_ARG_WITH -# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=283332 ---- a/libgphoto2_port/configure.ac 2010-01-07 00:25:53.000000000 +0100 -+++ b/libgphoto2_port/configure.ac 2010-01-07 00:25:43.000000000 +0100 -@@ -161,7 +161,6 @@ - dnl --------------------------------------------------------------------------- - dnl Apple Bonjour / mDNSResponder multicast DNS queries. - dnl --------------------------------------------------------------------------- --with_bonjour=no - AC_ARG_WITH([bonjour], - AS_HELP_STRING([--without-bonjour], [whether to exclude Bonjour PTP/IP autodetection]), - , diff --git a/media-libs/libgphoto2/libgphoto2-2.5.3.1.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.3.1.ebuild deleted file mode 100644 index b6e697bcd753..000000000000 --- a/media-libs/libgphoto2/libgphoto2-2.5.3.1.ebuild +++ /dev/null @@ -1,221 +0,0 @@ -# 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.3.1.ebuild,v 1.10 2014/07/30 19:24:55 ssuominen Exp $ - -# TODO -# 1. Track upstream bug --disable-docs does not work. -# http://sourceforge.net/tracker/index.php?func=detail&aid=1643870&group_id=8874&atid=108874 - -EAPI="5" - -inherit autotools eutils multilib udev user - -DESCRIPTION="Library that implements support for numerous digital cameras" -HOMEPAGE="http://www.gphoto.org/" -SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0/6" # libgphoto2.so soname version - -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="doc examples exif gd jpeg nls serial zeroconf" - -# By default, drivers for all supported cameras will be compiled. -# If you want to only compile for specific camera(s), set CAMERAS -# environment to a space-separated list (no commas) of drivers that -# you want to build. -IUSE_CAMERAS=" - adc65 agfa_cl20 aox ax203 - barbie - canon casio_qv clicksmart310 - digigr8 digita dimagev dimera3500 directory - enigma13 - fuji - gsmart300 - hp215 - iclick - jamcam jd11 jl2005a jl2005c - kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150 - largan lg_gsm - mars mustek - panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2 - ricoh ricoh_g3 - samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z - toshiba_pdrm11 topfield tp6801 -" - -for camera in ${IUSE_CAMERAS}; do - IUSE="${IUSE} cameras_${camera}" -done - -# libgphoto2 actually links to libtool -RDEPEND=" - dev-libs/libxml2:2 - sys-devel/libtool - virtual/libusb:1 - cameras_ax203? ( media-libs/gd:= ) - cameras_st2205? ( media-libs/gd:= ) - exif? ( >=media-libs/libexif-0.5.9:= ) - gd? ( media-libs/gd[jpeg=] ) - jpeg? ( virtual/jpeg:0 ) - serial? ( dev-libs/lockdev ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) -" -DEPEND="${RDEPEND} - sys-devel/flex - >=sys-devel/gettext-0.14.1 - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" -# FIXME: gtk-doc is broken -# >=dev-util/gtk-doc-1.10 )" - -RDEPEND="${RDEPEND} - ! /dev/null 2>&1; then - einfo "No camera drivers will be built since you did not specify any." - fi -} - -pkg_setup() { - enewgroup plugdev -} - -src_prepare() { - # Handle examples ourselves - sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ - || die "examples sed failed" - - # Fix pkgconfig file when USE="-exif" - if ! use exif; then - sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in || die " libgphoto2.pc sed failed" - fi - - sed -e 's/sleep 2//' -i m4m/gp-camlibs.m4 || die - - # Fix USE=zeroconf, bug #283332 - epatch "${FILESDIR}/${PN}-2.4.7-respect-bonjour.patch" - - eautoreconf -} - -src_configure() { - local cameras - local cam - local cam_warn=no - for cam in ${IUSE_CAMERAS} ; do - if use "cameras_${cam}"; then - cameras="${cameras},${cam}" - else - cam_warn=yes - fi - done - - if [ "${cam_warn}" = "yes" ]; then - [ -z "${cameras}" ] || cameras="${cameras:1}" - einfo "Enabled camera drivers: ${cameras:-none}" - ewarn "Upstream will not support you if you do not compile all camera drivers first" - else - cameras="all" - einfo "Enabled camera drivers: all" - fi - - local myconf - use doc || myconf="ac_cv_path_DOXYGEN=false" - - # Upstream doesn't default to --enable-option-checking due having another - # configure in libgphoto2_port/ that also needs to be checked on every bump - # - # Serial port uses either lockdev or ttylock, but we don't have ttylock - econf \ - --disable-docs \ - --disable-gp2ddb \ - $(use_with zeroconf bonjour) \ - $(use_enable nls) \ - $(use_with exif libexif auto) \ - $(use_with gd) \ - $(use_with jpeg) \ - $(use_enable serial) \ - $(use_enable serial lockdev) \ - --with-libusb=no \ - --with-libusb-1.0=auto \ - --disable-ttylock \ - --with-camlibs=${cameras} \ - --with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \ - --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \ - --with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \ - --with-rpmbuild=$(type -P true) \ - udevscriptdir="$(get_udevdir)" \ - ${myconf} - -# FIXME: gtk-doc is currently broken -# $(use_enable doc docs) -} - -src_compile() { - default - - if use doc; then - doxygen doc/Doxyfile || die "Documentation generation failed" - fi -} - -src_install() { - default - - # Empty dependency_libs in .la files, bug #386665 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - # Clean up unwanted files - rm "${ED}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed" - dodoc ChangeLog NEWS* README* AUTHORS TESTERS MAINTAINERS HACKING - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins examples/README examples/*.c examples/*.h - fi - - # FIXME: fixup autoconf bug - if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then - rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html" - fi - # end fixup - - local udev_rules cam_list - udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules" - cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list" - - if [ -x "${ED}"${cam_list} ]; then - # Let print-camera-list find libgphoto2.so - export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)" - # Let libgphoto2 find its camera-modules - export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}" - - einfo "Generating UDEV-rules ..." - mkdir -p "${ED}"/${udev_rules%/*} - echo -e "# do not edit this file, it will be overwritten on update\n#" \ - > "${ED}"/${udev_rules} - "${ED}"${cam_list} udev-rules version 175 group plugdev >> "${ED}"/${udev_rules} \ - || die "failed to create udev-rules" - else - eerror "Unable to find print-camera-list" - eerror "and therefore unable to generate hotplug usermap." - eerror "You will have to manually generate it by running:" - eerror " ${cam_list} udev-rules version 175 group plugdev > ${udev_rules}" - fi - -} - -pkg_postinst() { - if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" ; then - elog "Don't forget to add yourself to the plugdev group " - elog "if you want to be able to access your camera." - fi - - local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules - if [[ -f ${old_udev_rules} ]]; then - rm -f "${old_udev_rules}" - fi -} diff --git a/media-libs/libgphoto2/libgphoto2-2.5.4.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.4.ebuild deleted file mode 100644 index 7f41698434e1..000000000000 --- a/media-libs/libgphoto2/libgphoto2-2.5.4.ebuild +++ /dev/null @@ -1,227 +0,0 @@ -# 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.ebuild,v 1.2 2014/07/30 19:24:55 ssuominen Exp $ - -# TODO -# 1. Track upstream bug --disable-docs does not work. -# http://sourceforge.net/tracker/index.php?func=detail&aid=1643870&group_id=8874&atid=108874 - -EAPI="5" - -inherit autotools eutils multilib udev user - -DESCRIPTION="Library that implements support for numerous digital cameras" -HOMEPAGE="http://www.gphoto.org/" -SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0/6" # libgphoto2.so soname version - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="doc examples exif gd jpeg nls serial zeroconf" - -# By default, drivers for all supported cameras will be compiled. -# If you want to only compile for specific camera(s), set CAMERAS -# environment to a space-separated list (no commas) of drivers that -# you want to build. -IUSE_CAMERAS=" - adc65 agfa_cl20 aox ax203 - barbie - canon casio_qv clicksmart310 - digigr8 digita dimagev dimera3500 directory - enigma13 - fuji - gsmart300 - hp215 - iclick - jamcam jd11 jl2005a jl2005c - kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150 - largan lg_gsm - mars mustek - panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2 - ricoh ricoh_g3 - samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z - toshiba_pdrm11 topfield tp6801 -" - -for camera in ${IUSE_CAMERAS}; do - IUSE="${IUSE} cameras_${camera}" -done - -# libgphoto2 actually links to libtool -RDEPEND=" - dev-libs/libxml2:2 - sys-devel/libtool - virtual/libusb:1 - cameras_ax203? ( media-libs/gd:= ) - cameras_st2205? ( media-libs/gd:= ) - exif? ( >=media-libs/libexif-0.5.9:= ) - gd? ( media-libs/gd[jpeg=] ) - jpeg? ( virtual/jpeg:0 ) - serial? ( dev-libs/lockdev ) - zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) - ! /dev/null 2>&1; then - einfo "No camera drivers will be built since you did not specify any." - fi -} - -pkg_setup() { - enewgroup plugdev -} - -src_prepare() { - # Handle examples ourselves - sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ - || die "examples sed failed" - - # Fix pkgconfig file when USE="-exif" - # https://sourceforge.net/p/gphoto/bugs/980/ - if ! use exif; then - sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in || die " libgphoto2.pc sed failed" - fi - - sed -e 's/sleep 2//' -i m4m/gp-camlibs.m4 || die - - # Fix USE=zeroconf, bug #283332 - # https://sourceforge.net/p/gphoto/bugs/981/ - epatch "${FILESDIR}/${PN}-2.4.7-respect-bonjour.patch" - - eautoreconf -} - -src_configure() { - local cameras - local cam - local cam_warn=no - for cam in ${IUSE_CAMERAS} ; do - if use "cameras_${cam}"; then - cameras="${cameras},${cam}" - else - cam_warn=yes - fi - done - - if [ "${cam_warn}" = "yes" ]; then - [ -z "${cameras}" ] || cameras="${cameras:1}" - einfo "Enabled camera drivers: ${cameras:-none}" - ewarn "Upstream will not support you if you do not compile all camera drivers first" - else - cameras="all" - einfo "Enabled camera drivers: all" - fi - - local myconf - use doc || myconf="ac_cv_path_DOXYGEN=false" - - # gd detection is broken: https://sourceforge.net/p/gphoto/bugs/982/ - if use gd; then - export LIBGD_CFLAGS=" " - export LIBGD_LIBS="-lgd" - fi - - # Upstream doesn't default to --enable-option-checking due having another - # configure in libgphoto2_port/ that also needs to be checked on every bump - # - # Serial port uses either lockdev or ttylock, but we don't have ttylock - econf \ - --disable-docs \ - --disable-gp2ddb \ - $(use_with zeroconf bonjour) \ - $(use_enable nls) \ - $(use_with exif libexif auto) \ - $(use_with gd) \ - $(use_with jpeg) \ - $(use_enable serial) \ - $(use_enable serial lockdev) \ - --with-libusb=no \ - --with-libusb-1.0=auto \ - --disable-ttylock \ - --with-camlibs=${cameras} \ - --with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \ - --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \ - --with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \ - --with-rpmbuild=$(type -P true) \ - udevscriptdir="$(get_udevdir)" \ - ${myconf} -} - -src_compile() { - default - - if use doc; then - doxygen doc/Doxyfile || die "Documentation generation failed" - fi -} - -src_install() { - default - - # Empty dependency_libs in .la files, bug #386665 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - # Remove recursive symlink - # https://sourceforge.net/p/gphoto/bugs/983/ - rm "${ED}/usr/include/gphoto2/gphoto2" || die - - # Clean up unwanted files - rm "${ED}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed" - dodoc ChangeLog NEWS* README* AUTHORS TESTERS MAINTAINERS HACKING - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins examples/README examples/*.c examples/*.h - fi - - # FIXME: fixup autoconf bug - if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then - rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html" - fi - # end fixup - - local udev_rules cam_list - udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules" - cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list" - - if [ -x "${ED}"${cam_list} ]; then - # Let print-camera-list find libgphoto2.so - export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)" - # Let libgphoto2 find its camera-modules - export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}" - - einfo "Generating UDEV-rules ..." - mkdir -p "${ED}"/${udev_rules%/*} - echo -e "# do not edit this file, it will be overwritten on update\n#" \ - > "${ED}"/${udev_rules} - "${ED}"${cam_list} udev-rules version 175 group plugdev >> "${ED}"/${udev_rules} \ - || die "failed to create udev-rules" - else - eerror "Unable to find print-camera-list" - eerror "and therefore unable to generate hotplug usermap." - eerror "You will have to manually generate it by running:" - eerror " ${cam_list} udev-rules version 175 group plugdev > ${udev_rules}" - fi - -} - -pkg_postinst() { - if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" ; then - elog "Don't forget to add yourself to the plugdev group " - elog "if you want to be able to access your camera." - fi - - local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules - if [[ -f ${old_udev_rules} ]]; then - rm -f "${old_udev_rules}" - fi -} diff --git a/media-libs/libgphoto2/libgphoto2-2.5.4-r2.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.7.ebuild similarity index 82% rename from media-libs/libgphoto2/libgphoto2-2.5.4-r2.ebuild rename to media-libs/libgphoto2/libgphoto2-2.5.7.ebuild index c35aba33a4fd..e28f70e30b7e 100644 --- a/media-libs/libgphoto2/libgphoto2-2.5.4-r2.ebuild +++ b/media-libs/libgphoto2/libgphoto2-2.5.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 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-r2.ebuild,v 1.1 2014/11/06 18:27:31 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.7.ebuild,v 1.1 2015/01/26 11:39:25 pacho Exp $ # TODO # 1. Track upstream bug --disable-docs does not work. @@ -8,16 +8,18 @@ EAPI="5" -inherit autotools eutils multilib multilib-minimal udev user +inherit eutils multilib multilib-minimal udev user DESCRIPTION="Library that implements support for numerous digital cameras" HOMEPAGE="http://www.gphoto.org/" SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2" LICENSE="GPL-2" + +# FIXME: should we also bump for libgphoto2_port.so soname version? SLOT="0/6" # libgphoto2.so soname version -KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux" IUSE="doc examples exif gd jpeg nls serial zeroconf" # By default, drivers for all supported cameras will be compiled. @@ -48,13 +50,10 @@ for camera in ${IUSE_CAMERAS}; do IUSE="${IUSE} cameras_${camera}" done -# libgphoto2 actually links to libltdl, leave old libtool multilib dep there for now +# libgphoto2 actually links to libltdl RDEPEND=" >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] - || ( - dev-libs/libltdl:0[${MULTILIB_USEDEP}] - >=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}] - ) + dev-libs/libltdl:0[${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}] ) @@ -67,7 +66,8 @@ RDEPEND=" abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] - )" + ) +" DEPEND="${RDEPEND} dev-util/gtk-doc-am sys-devel/flex @@ -96,19 +96,9 @@ src_prepare() { sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ || die "examples sed failed" - # Fix pkgconfig file when USE="-exif" - # https://sourceforge.net/p/gphoto/bugs/980/ - if ! use exif; then - sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in || die " libgphoto2.pc sed failed" - fi - - sed -e 's/sleep 2//' -i m4m/gp-camlibs.m4 || die - - # Fix USE=zeroconf, bug #283332 - # https://sourceforge.net/p/gphoto/bugs/981/ - epatch "${FILESDIR}/${PN}-2.4.7-respect-bonjour.patch" - - eautoreconf + # If running eautoreconf + # sed -e 's/sleep 2//' -i m4m/gp-camlibs.m4 || die + sed -e 's/sleep 2//' -i configure || die } multilib_src_configure() { @@ -135,12 +125,6 @@ multilib_src_configure() { local myconf use doc || myconf=( ac_cv_path_DOXYGEN=false ) - # gd detection is broken: https://sourceforge.net/p/gphoto/bugs/982/ - if use gd; then - export LIBGD_CFLAGS=" " - export LIBGD_LIBS="-lgd" - fi - # Upstream doesn't default to --enable-option-checking due having another # configure in libgphoto2_port/ that also needs to be checked on every bump # @@ -177,12 +161,7 @@ multilib_src_compile() { } multilib_src_install_all() { - # Empty dependency_libs in .la files, bug #386665 - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - # Remove recursive symlink - # https://sourceforge.net/p/gphoto/bugs/983/ - rm "${ED}/usr/include/gphoto2/gphoto2" || die + prune_libtool_files --modules # Clean up unwanted files rm "${ED}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed" @@ -193,7 +172,7 @@ multilib_src_install_all() { doins examples/README examples/*.c examples/*.h fi - # FIXME: fixup autoconf bug + # FIXME: fixup autoconf bug #???? if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html" fi