From 20406f5497c86372af3d5119edc06f01454ece49 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Wed, 7 Nov 2007 00:57:07 +0000 Subject: prune old versions, change location of the fdi file in 2.4.0 (Portage version: 2.1.3.16) --- media-libs/libgphoto2/ChangeLog | 10 +- .../libgphoto2/files/digest-libgphoto2-2.3.1-r2 | 3 - .../libgphoto2/files/digest-libgphoto2-2.3.1-r3 | 3 - .../libgphoto2/files/digest-libgphoto2-2.3.1-r4 | 3 - .../files/libgphoto2-2.3.1-udev-rules-fix.diff | 29 ---- .../files/libgphoto2-2.3.1-udev-rules-fix2.diff | 28 ---- media-libs/libgphoto2/libgphoto2-2.3.1-r2.ebuild | 157 --------------------- media-libs/libgphoto2/libgphoto2-2.3.1-r3.ebuild | 157 --------------------- media-libs/libgphoto2/libgphoto2-2.3.1-r4.ebuild | 157 --------------------- media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild | 4 +- 10 files changed, 11 insertions(+), 540 deletions(-) delete mode 100644 media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r2 delete mode 100644 media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r3 delete mode 100644 media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r4 delete mode 100644 media-libs/libgphoto2/files/libgphoto2-2.3.1-udev-rules-fix.diff delete mode 100644 media-libs/libgphoto2/files/libgphoto2-2.3.1-udev-rules-fix2.diff delete mode 100644 media-libs/libgphoto2/libgphoto2-2.3.1-r2.ebuild delete mode 100644 media-libs/libgphoto2/libgphoto2-2.3.1-r3.ebuild delete mode 100644 media-libs/libgphoto2/libgphoto2-2.3.1-r4.ebuild (limited to 'media-libs/libgphoto2') diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog index 9e3adc0ea7f7..6a350b3f7813 100644 --- a/media-libs/libgphoto2/ChangeLog +++ b/media-libs/libgphoto2/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-libs/libgphoto2 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.112 2007/10/03 22:39:28 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.113 2007/11/07 00:57:06 eva Exp $ + + 06 Nov 2007; Gilles Dartiguelongue + -files/libgphoto2-2.3.1-udev-rules-fix.diff, + -files/libgphoto2-2.3.1-udev-rules-fix2.diff, -libgphoto2-2.3.1-r2.ebuild, + -libgphoto2-2.3.1-r3.ebuild, -libgphoto2-2.3.1-r4.ebuild, + libgphoto2-2.4.0-r1.ebuild: + prune old versions + change location of the fdi file in 2.4.0 03 Oct 2007; Gilles Dartiguelongue libgphoto2-2.2.1-r1.ebuild: diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r2 b/media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r2 deleted file mode 100644 index 770cf01bd000..000000000000 --- a/media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 37f85e34e5b6031ddf6cac8b8782ac4f libgphoto2-2.3.1.tar.bz2 3230934 -RMD160 ab678a5006a89ef1fe9f052dac1f9738961cc3a8 libgphoto2-2.3.1.tar.bz2 3230934 -SHA256 b56433ae44e593ea0c55dd4ad69074e59151920f266dc646c1dc7e80ebe3b727 libgphoto2-2.3.1.tar.bz2 3230934 diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r3 b/media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r3 deleted file mode 100644 index 770cf01bd000..000000000000 --- a/media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 37f85e34e5b6031ddf6cac8b8782ac4f libgphoto2-2.3.1.tar.bz2 3230934 -RMD160 ab678a5006a89ef1fe9f052dac1f9738961cc3a8 libgphoto2-2.3.1.tar.bz2 3230934 -SHA256 b56433ae44e593ea0c55dd4ad69074e59151920f266dc646c1dc7e80ebe3b727 libgphoto2-2.3.1.tar.bz2 3230934 diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r4 b/media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r4 deleted file mode 100644 index 770cf01bd000..000000000000 --- a/media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 37f85e34e5b6031ddf6cac8b8782ac4f libgphoto2-2.3.1.tar.bz2 3230934 -RMD160 ab678a5006a89ef1fe9f052dac1f9738961cc3a8 libgphoto2-2.3.1.tar.bz2 3230934 -SHA256 b56433ae44e593ea0c55dd4ad69074e59151920f266dc646c1dc7e80ebe3b727 libgphoto2-2.3.1.tar.bz2 3230934 diff --git a/media-libs/libgphoto2/files/libgphoto2-2.3.1-udev-rules-fix.diff b/media-libs/libgphoto2/files/libgphoto2-2.3.1-udev-rules-fix.diff deleted file mode 100644 index 675855877d7c..000000000000 --- a/media-libs/libgphoto2/files/libgphoto2-2.3.1-udev-rules-fix.diff +++ /dev/null @@ -1,29 +0,0 @@ -diff -Nur libgphoto2-2.3.1/packaging/generic/print-camera-list.c libgphoto2-2.3.1-udev-fix/packaging/generic/print-camera-list.c ---- libgphoto2-2.3.1/packaging/generic/print-camera-list.c 2006-12-24 10:16:19.000000000 -0500 -+++ libgphoto2-2.3.1-udev-fix/packaging/generic/print-camera-list.c 2007-01-31 10:39:12.000000000 -0500 -@@ -299,7 +299,7 @@ - /* Note: 2 lines because we need to use || ... having them on the same - * line would mean &&. - */ -- printf ("SUBSYSTEM!=\"usb*\", GOTO=\"libgphoto2_rules_end\"\n"); -+ printf ("SUBSYSTEM!=\"usb_device\", GOTO=\"libgphoto2_rules_end\"\n"); - printf ("ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n"); - return 0; - } -@@ -479,9 +479,14 @@ - else - fprintf(stderr,"unhandled interface match flags %x\n", flags); - } -- } else { -- printf ("ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ", -+ } else if (flags & GP_USB_HOTPLUG_MATCH_VENDOR_ID) { -+ -+ printf ("ATTR{idVendor}==\"%04x\", ATTR{idProduct}==\"%04x\", ", - a->usb_vendor, a->usb_product); -+ } else { -+ fprintf(stderr, "Attempted to output rule for Camera: \"%s\" , Vendor: \"%04x\" , Product: \"%04x\"", -+ a->model, a->usb_vendor, a->usb_product); -+ return 0; - } - if ((*params->argv)[1] == NULL) { - const char *hotplug_script = ((*params->argv)[0] != NULL) diff --git a/media-libs/libgphoto2/files/libgphoto2-2.3.1-udev-rules-fix2.diff b/media-libs/libgphoto2/files/libgphoto2-2.3.1-udev-rules-fix2.diff deleted file mode 100644 index 2e939b491b9a..000000000000 --- a/media-libs/libgphoto2/files/libgphoto2-2.3.1-udev-rules-fix2.diff +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nur libgphoto2-2.3.1/packaging/generic/print-camera-list.c libgphoto2-2.3.1-udev-fix/packaging/generic/print-camera-list.c ---- libgphoto2-2.3.1/packaging/generic/print-camera-list.c 2006-12-24 10:16:19.000000000 -0500 -+++ libgphoto2-2.3.1-udev-fix/packaging/generic/print-camera-list.c 2007-01-31 10:39:12.000000000 -0500 -@@ -299,7 +299,7 @@ - /* Note: 2 lines because we need to use || ... having them on the same - * line would mean &&. - */ -- printf ("SUBSYSTEM!=\"usb*\", GOTO=\"libgphoto2_rules_end\"\n"); -+ printf ("SUBSYSTEM!=\"usb_device\", GOTO=\"libgphoto2_rules_end\"\n"); - printf ("ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n"); - return 0; - } -@@ -479,9 +479,14 @@ - else - fprintf(stderr,"unhandled interface match flags %x\n", flags); - } -- } else { -+ } else if (flags & GP_USB_HOTPLUG_MATCH_VENDOR_ID) { -+ - printf ("ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ", - a->usb_vendor, a->usb_product); -+ } else { -+ fprintf(stderr, "Attempted to output rule for Camera: \"%s\" , Vendor: \"%04x\" , Product: \"%04x\"", -+ a->model, a->usb_vendor, a->usb_product); -+ return 0; - } - if ((*params->argv)[1] == NULL) { - const char *hotplug_script = ((*params->argv)[0] != NULL) diff --git a/media-libs/libgphoto2/libgphoto2-2.3.1-r2.ebuild b/media-libs/libgphoto2/libgphoto2-2.3.1-r2.ebuild deleted file mode 100644 index 1fc4097332d2..000000000000 --- a/media-libs/libgphoto2/libgphoto2-2.3.1-r2.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.3.1-r2.ebuild,v 1.6 2007/07/12 03:10:24 mr_bones_ 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 -# 2. Track upstream bug udevscriptdir does not work. -# http://sourceforge.net/tracker/index.php?func=detail&aid=1646520&group_id=8874&atid=108874 -# http://sourceforge.net/tracker/index.php?func=detail&aid=1648346&group_id=8874&atid=108874 -# 3. Track upstream bug regarding rpm usage. -# http://sourceforge.net/tracker/index.php?func=detail&aid=1643813&group_id=8874&atid=358874 - -inherit eutils - -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" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -IUSE="nls doc exif hal kernel_linux" -RESTRICT="test" - -# By default, drivers for all supported cameras will be compiled. -# If you want to only compile for specific cameras(s), set CAMERAS -# environment to a space-separated list (no commas) of drivers that -# you want to build. -IUSE_CAMERAS="adc65 agfa-cl20 aox barbie canon casio clicksmart310 digigr8 digita -dimera directory enigma13 fuji gsmart300 hp215 iclick jamcam jd11 kodak -konica largan lg_gsm mars minolta mustek panasonic pccam300 pccam600 -polaroid ptp2 ricoh samsung sierra sipix smal sonix sonydscf1 sonydscf55 -soundvision spca50x sq905 stv0674 stv0680 sx330z template toshiba" - -for camera in ${IUSE_CAMERAS}; do - IUSE="${IUSE} cameras_${camera}" -done - -RDEPEND=">=dev-libs/libusb-0.1.8 - exif? ( >=media-libs/libexif-0.5.9 ) - hal? ( >=sys-apps/hal-0.5 ) - sys-devel/libtool" -DEPEND="${RDEPEND} - dev-util/pkgconfig - doc? ( app-doc/doxygen )" - -pkg_setup() { - if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then - einfo "libgphoto2 supports: all ${IUSE_CAMERAS}" - einfo "All camera drivers will be built since you did not specify" - einfo "via the CAMERAS variable what camera you use." - ewarn "NOTICE: Upstream will not support you if you do not compile all camera drivers first" - fi - - enewgroup plugdev || die "Error creating plugdev group" -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-rpm.patch" - - # Fix for udev >= 098 rules generation - epatch "${FILESDIR}"/${P}-udev-rules-fix.diff -} - -src_compile() { - local cameras - local cam - for cam in ${IUSE_CAMERAS} ; do - use "cameras_${cam}" && cameras="${cameras},${cam}" - done - [ -z "${cameras}" ] \ - && cameras="all" \ - || cameras="${cameras:1}" - - einfo "Enabled camera drivers: ${cameras}" - [ "${cameras}" != "all" ] && \ - ewarn "Upstream will not support you if you do not compile all camera drivers first" - - CFLAGS="${CFLAGS} -DCANON_EXPERIMENTAL_20D" - - local myconf - - use exif \ - && myconf="${myconf} --with-exif-prefix=/usr" \ - || myconf="${myconf} --without-exif" - - econf \ - --with-drivers=${cameras} \ - --with-doc-dir=/usr/share/doc/${PF} \ - --with-html-dir=/usr/share/doc/${PF}/html \ - --with-hotplug-doc-dir=/usr/share/doc/${PF}/hotplug \ - $(use_enable nls) \ - --with-rpmbuild=/bin/true \ - --disable-docs \ - udevscriptdir=/lib/udev \ - GTKDOC=/bin/true \ - ${myconf} || die "econf failed" -# $(use_enable doc docs) \ TODO - - emake || die "make failed" -} - -src_install() { - emake DESTDIR=${D} install || die "install failed" - - # fixup autoconf bug TODO - if ! use doc && [ -d ${D}/usr/share/doc/${PF}/apidocs.html ]; then - rm -fr "${D}/usr/share/doc/${PF}/apidocs.html" - fi - # end fixup - - # fixup udevscriptdir is not working TODO - dodir /lib - mv "${D}/usr/lib/udev" "${D}/lib" - # end fixup - - dodoc ChangeLog NEWS* README AUTHORS TESTERS MAINTAINERS HACKING - - HAL_FDI="/usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi" - UDEV_RULES="/etc/udev/rules.d/99-libgphoto2.rules" - - if [ -x ${D}/usr/$(get_libdir)/libgphoto2/print-camera-list ]; then - # Let print-camera-list find libgphoto2.so - export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)" - # Let libgphoto2 find its camera-modules - export CAMLIBS="${D}/usr/$(get_libdir)/libgphoto2/${PV}" - - if use hal; then - einfo "Generating HAL FDI files ..." - mkdir -p ${D}/${HAL_FDI%/*} - ${D}/usr/$(get_libdir)/libgphoto2/print-camera-list hal-fdi >> ${D}/${HAL_FDI} \ - || die "failed to create hal-fdi" - fi - - einfo "Generating UDEV-rules ..." - mkdir -p ${D}/${UDEV_RULES%/*} - ${D}/usr/$(get_libdir)/libgphoto2/print-camera-list \ - udev-rules-0.98 group plugdev mode 0660 >> ${D}/${UDEV_RULES} \ - || die "failed to create udev-rules" - else - eerror "Unable to find print-camera-list" - eerror "and therefore unable to generate hotplug usermap or HAL FDI files." - eerror "You will have to manually generate it by running:" - eerror " /usr/$(get_libdir)/libgphoto2/print-camera-list udev-rules-0.98 group plugdev mode 0660 > ${UDEV_RULES}" - eerror " /usr/$(get_libdir)/libgphoto2/print-camera-list hal-fdi > ${HAL_FDI}" - fi - -} - -pkg_postinst() { - elog "Don't forget to add yourself to the plugdev group " - elog "if you want to be able to access your camera." -} diff --git a/media-libs/libgphoto2/libgphoto2-2.3.1-r3.ebuild b/media-libs/libgphoto2/libgphoto2-2.3.1-r3.ebuild deleted file mode 100644 index 9cf25947615e..000000000000 --- a/media-libs/libgphoto2/libgphoto2-2.3.1-r3.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.3.1-r3.ebuild,v 1.6 2007/07/12 03:10:24 mr_bones_ 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 -# 2. Track upstream bug udevscriptdir does not work. -# http://sourceforge.net/tracker/index.php?func=detail&aid=1646520&group_id=8874&atid=108874 -# http://sourceforge.net/tracker/index.php?func=detail&aid=1648346&group_id=8874&atid=108874 -# 3. Track upstream bug regarding rpm usage. -# http://sourceforge.net/tracker/index.php?func=detail&aid=1643813&group_id=8874&atid=358874 - -inherit eutils multilib - -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" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -IUSE="nls doc exif hal kernel_linux" -RESTRICT="test" - -# 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 barbie canon casio clicksmart310 digigr8 digita -dimera directory enigma13 fuji gsmart300 hp215 iclick jamcam jd11 kodak -konica largan lg_gsm mars minolta mustek panasonic pccam300 pccam600 -polaroid ptp2 ricoh samsung sierra sipix smal sonix sonydscf1 sonydscf55 -soundvision spca50x sq905 stv0674 stv0680 sx330z template toshiba" - -for camera in ${IUSE_CAMERAS}; do - IUSE="${IUSE} cameras_${camera}" -done - -RDEPEND=">=dev-libs/libusb-0.1.8 - exif? ( >=media-libs/libexif-0.5.9 ) - hal? ( >=sys-apps/hal-0.5 ) - sys-devel/libtool" -DEPEND="${RDEPEND} - dev-util/pkgconfig - doc? ( app-doc/doxygen )" - -pkg_setup() { - if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then - einfo "libgphoto2 supports: all ${IUSE_CAMERAS}" - einfo "All camera drivers will be built since you did not specify" - einfo "via the CAMERAS variable what camera you use." - ewarn "NOTICE: Upstream will not support you if you do not compile all camera drivers first" - fi - - enewgroup plugdev || die "Error creating plugdev group" -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-rpm.patch" - - # Fix for udev >= 098 rules generation - epatch "${FILESDIR}"/${P}-udev-rules-fix.diff -} - -src_compile() { - local cameras - local cam - for cam in ${IUSE_CAMERAS} ; do - use "cameras_${cam}" && cameras="${cameras},${cam}" - done - [ -z "${cameras}" ] \ - && cameras="all" \ - || cameras="${cameras:1}" - - einfo "Enabled camera drivers: ${cameras}" - [ "${cameras}" != "all" ] && \ - ewarn "Upstream will not support you if you do not compile all camera drivers first" - - CFLAGS="${CFLAGS} -DCANON_EXPERIMENTAL_20D" - - local myconf - - use exif \ - && myconf="${myconf} --with-exif-prefix=/usr" \ - || myconf="${myconf} --without-exif" - - econf \ - --with-drivers=${cameras} \ - --with-doc-dir=/usr/share/doc/${PF} \ - --with-html-dir=/usr/share/doc/${PF}/html \ - --with-hotplug-doc-dir=/usr/share/doc/${PF}/hotplug \ - $(use_enable nls) \ - --with-rpmbuild=/bin/true \ - --disable-docs \ - udevscriptdir=/lib/udev \ - GTKDOC=/bin/true \ - ${myconf} || die "econf failed" -# $(use_enable doc docs) \ TODO - - emake || die "make failed" -} - -src_install() { - emake DESTDIR=${D} install || die "install failed" - - # fixup autoconf bug TODO - if ! use doc && [ -d ${D}/usr/share/doc/${PF}/apidocs.html ]; then - rm -fr "${D}/usr/share/doc/${PF}/apidocs.html" - fi - # end fixup - - # fixup udevscriptdir is not working TODO - dodir /lib - mv "${D}/usr/$(get_libdir)/udev" "${D}/lib" || die "Moving udev-helper files failed." - # end fixup - - dodoc ChangeLog NEWS* README AUTHORS TESTERS MAINTAINERS HACKING - - HAL_FDI="/usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi" - UDEV_RULES="/etc/udev/rules.d/99-libgphoto2.rules" - - if [ -x ${D}/usr/$(get_libdir)/libgphoto2/print-camera-list ]; then - # Let print-camera-list find libgphoto2.so - export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)" - # Let libgphoto2 find its camera-modules - export CAMLIBS="${D}/usr/$(get_libdir)/libgphoto2/${PV}" - - if use hal; then - einfo "Generating HAL FDI files ..." - mkdir -p ${D}/${HAL_FDI%/*} - ${D}/usr/$(get_libdir)/libgphoto2/print-camera-list hal-fdi >> ${D}/${HAL_FDI} \ - || die "failed to create hal-fdi" - fi - - einfo "Generating UDEV-rules ..." - mkdir -p ${D}/${UDEV_RULES%/*} - ${D}/usr/$(get_libdir)/libgphoto2/print-camera-list \ - udev-rules-0.98 group plugdev mode 0660 >> ${D}/${UDEV_RULES} \ - || die "failed to create udev-rules" - else - eerror "Unable to find print-camera-list" - eerror "and therefore unable to generate hotplug usermap or HAL FDI files." - eerror "You will have to manually generate it by running:" - eerror " /usr/$(get_libdir)/libgphoto2/print-camera-list udev-rules-0.98 group plugdev mode 0660 > ${UDEV_RULES}" - eerror " /usr/$(get_libdir)/libgphoto2/print-camera-list hal-fdi > ${HAL_FDI}" - fi - -} - -pkg_postinst() { - elog "Don't forget to add yourself to the plugdev group " - elog "if you want to be able to access your camera." -} diff --git a/media-libs/libgphoto2/libgphoto2-2.3.1-r4.ebuild b/media-libs/libgphoto2/libgphoto2-2.3.1-r4.ebuild deleted file mode 100644 index 1e00198b2928..000000000000 --- a/media-libs/libgphoto2/libgphoto2-2.3.1-r4.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.3.1-r4.ebuild,v 1.4 2007/07/12 03:10:24 mr_bones_ 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 -# 2. Track upstream bug udevscriptdir does not work. -# http://sourceforge.net/tracker/index.php?func=detail&aid=1646520&group_id=8874&atid=108874 -# http://sourceforge.net/tracker/index.php?func=detail&aid=1648346&group_id=8874&atid=108874 -# 3. Track upstream bug regarding rpm usage. -# http://sourceforge.net/tracker/index.php?func=detail&aid=1643813&group_id=8874&atid=358874 - -inherit eutils multilib - -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" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" - -IUSE="nls doc exif hal kernel_linux" -RESTRICT="test" - -# 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 barbie canon casio clicksmart310 digigr8 digita -dimera directory enigma13 fuji gsmart300 hp215 iclick jamcam jd11 kodak -konica largan lg_gsm mars minolta mustek panasonic pccam300 pccam600 -polaroid ptp2 ricoh samsung sierra sipix smal sonix sonydscf1 sonydscf55 -soundvision spca50x sq905 stv0674 stv0680 sx330z template toshiba" - -for camera in ${IUSE_CAMERAS}; do - IUSE="${IUSE} cameras_${camera}" -done - -RDEPEND=">=dev-libs/libusb-0.1.8 - exif? ( >=media-libs/libexif-0.5.9 ) - hal? ( >=sys-apps/hal-0.5 ) - sys-devel/libtool" -DEPEND="${RDEPEND} - dev-util/pkgconfig - doc? ( app-doc/doxygen )" - -pkg_setup() { - if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then - einfo "libgphoto2 supports: all ${IUSE_CAMERAS}" - einfo "All camera drivers will be built since you did not specify" - einfo "via the CAMERAS variable what camera you use." - ewarn "NOTICE: Upstream will not support you if you do not compile all camera drivers first" - fi - - enewgroup plugdev || die "Error creating plugdev group" -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}-rpm.patch" - - # Fix for udev >= 098 rules generation - epatch "${FILESDIR}"/${P}-udev-rules-fix2.diff -} - -src_compile() { - local cameras - local cam - for cam in ${IUSE_CAMERAS} ; do - use "cameras_${cam}" && cameras="${cameras},${cam}" - done - [ -z "${cameras}" ] \ - && cameras="all" \ - || cameras="${cameras:1}" - - einfo "Enabled camera drivers: ${cameras}" - [ "${cameras}" != "all" ] && \ - ewarn "Upstream will not support you if you do not compile all camera drivers first" - - CFLAGS="${CFLAGS} -DCANON_EXPERIMENTAL_20D" - - local myconf - - use exif \ - && myconf="${myconf} --with-exif-prefix=/usr" \ - || myconf="${myconf} --without-exif" - - econf \ - --with-drivers=${cameras} \ - --with-doc-dir=/usr/share/doc/${PF} \ - --with-html-dir=/usr/share/doc/${PF}/html \ - --with-hotplug-doc-dir=/usr/share/doc/${PF}/hotplug \ - $(use_enable nls) \ - --with-rpmbuild=/bin/true \ - --disable-docs \ - udevscriptdir=/lib/udev \ - GTKDOC=/bin/true \ - ${myconf} || die "econf failed" -# $(use_enable doc docs) \ TODO - - emake || die "make failed" -} - -src_install() { - emake DESTDIR=${D} install || die "install failed" - - # fixup autoconf bug TODO - if ! use doc && [ -d ${D}/usr/share/doc/${PF}/apidocs.html ]; then - rm -fr "${D}/usr/share/doc/${PF}/apidocs.html" - fi - # end fixup - - # fixup udevscriptdir is not working TODO - dodir /lib - mv "${D}/usr/$(get_libdir)/udev" "${D}/lib" || die "Moving udev-helper files failed." - # end fixup - - dodoc ChangeLog NEWS* README AUTHORS TESTERS MAINTAINERS HACKING - - HAL_FDI="/usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi" - UDEV_RULES="/etc/udev/rules.d/99-libgphoto2.rules" - - if [ -x ${D}/usr/$(get_libdir)/libgphoto2/print-camera-list ]; then - # Let print-camera-list find libgphoto2.so - export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)" - # Let libgphoto2 find its camera-modules - export CAMLIBS="${D}/usr/$(get_libdir)/libgphoto2/${PV}" - - if use hal; then - einfo "Generating HAL FDI files ..." - mkdir -p ${D}/${HAL_FDI%/*} - ${D}/usr/$(get_libdir)/libgphoto2/print-camera-list hal-fdi >> ${D}/${HAL_FDI} \ - || die "failed to create hal-fdi" - fi - - einfo "Generating UDEV-rules ..." - mkdir -p ${D}/${UDEV_RULES%/*} - ${D}/usr/$(get_libdir)/libgphoto2/print-camera-list \ - udev-rules-0.98 group plugdev mode 0660 >> ${D}/${UDEV_RULES} \ - || die "failed to create udev-rules" - else - eerror "Unable to find print-camera-list" - eerror "and therefore unable to generate hotplug usermap or HAL FDI files." - eerror "You will have to manually generate it by running:" - eerror " /usr/$(get_libdir)/libgphoto2/print-camera-list udev-rules-0.98 group plugdev mode 0660 > ${UDEV_RULES}" - eerror " /usr/$(get_libdir)/libgphoto2/print-camera-list hal-fdi > ${HAL_FDI}" - fi - -} - -pkg_postinst() { - elog "Don't forget to add yourself to the plugdev group " - elog "if you want to be able to access your camera." -} diff --git a/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild index dd11f7e11f50..3d9cfb2c44c3 100644 --- a/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild +++ b/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild,v 1.4 2007/09/27 11:19:19 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.0-r1.ebuild,v 1.5 2007/11/07 00:57:06 eva Exp $ # TODO # 1. Track upstream bug --disable-docs does not work. @@ -129,7 +129,7 @@ src_install() { dodoc ChangeLog NEWS* README AUTHORS TESTERS MAINTAINERS HACKING - HAL_FDI="/usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi" + HAL_FDI="/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi" UDEV_RULES="/etc/udev/rules.d/70-libgphoto2.rules" if [ -x "${D}"/usr/$(get_libdir)/libgphoto2/print-camera-list ]; then -- cgit v1.2.3-65-gdbad