bump to 2.4.0

(Portage version: 2.1.3.9)

5 files changed, 195 insertions, 1 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index a159f7332537..fa38d6f0c81b 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,13 @@
 # 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.105 2007/08/30 12:44:30 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.106 2007/09/24 22:46:35 eva Exp $
+
+*libgphoto2-2.4.0 (24 Sep 2007)
+
+  24 Sep 2007; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/libgphoto2-2.4.0-as-needed.patch,
+  +files/libgphoto2-2.4.0-rpm.patch, +libgphoto2-2.4.0.ebuild:
+  bump to 2.4.0
 
   30 Aug 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
   Removing liquidx from metadata due to his retirement (see #171155 for
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.4.0 b/media-libs/libgphoto2/files/digest-libgphoto2-2.4.0
new file mode 100644
index 000000000000..d6f9ffd6b2d9
--- /dev/null
+++ b/media-libs/libgphoto2/files/digest-libgphoto2-2.4.0
@@ -0,0 +1,3 @@
+MD5 a60154772635b693ff08b4f34dea7f61 libgphoto2-2.4.0.tar.bz2 3180009
+RMD160 4cba4247bd7e4f9334f2f6bda649b343007da775 libgphoto2-2.4.0.tar.bz2 3180009
+SHA256 0dc26b7a8568dee7634bebbaf9f7d3e3ab9460424e6297a595e41c4fddbbdb79 libgphoto2-2.4.0.tar.bz2 3180009
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.0-as-needed.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.0-as-needed.patch
new file mode 100644
index 000000000000..9ea5c316c2f5
--- /dev/null
+++ b/media-libs/libgphoto2/files/libgphoto2-2.4.0-as-needed.patch
@@ -0,0 +1,11 @@
+--- m4m/gp-libltdl.m4.old	2007-09-24 23:17:53.000000000 +0200
++++ m4m/gp-libltdl.m4	2007-09-24 23:18:26.000000000 +0200
+@@ -36,7 +36,7 @@
+ saved_CPPFLAGS="$CPPFLAGS"
+ saved_LDFLAGS="$LDFLAGS"
+ CPPFLAGS="$CPPFLAGS $LTDLINCL"
+-LDFLAGS="$LDFLAGS $LIBLTDL"
++LDFLAGS="$LIBLTDL $LDFLAGS"
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([dnl
+ #include <stdlib.h> /* for NULL */
+ #include <ltdl.h>   /* for lt_* */
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.4.0-rpm.patch b/media-libs/libgphoto2/files/libgphoto2-2.4.0-rpm.patch
new file mode 100644
index 000000000000..c34e995ae54f
--- /dev/null
+++ b/media-libs/libgphoto2/files/libgphoto2-2.4.0-rpm.patch
@@ -0,0 +1,11 @@
+--- configure.old	2007-09-24 22:21:16.000000000 +0200
++++ configure	2007-09-24 22:21:27.000000000 +0200
+@@ -26609,7 +26609,7 @@
+ # whether libusb-devel is installed or not defines whether the RPM
+ # packages we're going to build will depend on libusb and libusb-devel
+ # RPM packages or not.
+- if rpm -q libusb-devel > /dev/null 2>&1; then
++ if false -q libusb-devel > /dev/null 2>&1; then
+   RPM_LIBUSB_DEVEL_TRUE=
+   RPM_LIBUSB_DEVEL_FALSE='#'
+ else
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.0.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.0.ebuild
new file mode 100644
index 000000000000..5c78890eec46
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.4.0.ebuild
@@ -0,0 +1,162 @@
+# 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.ebuild,v 1.1 2007/09/24 22:46:35 eva 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 autotools
+
+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 casio_qv clicksmart310
+digigr8 digita dimera3500 directory enigma13 fuji gsmart300 hp215 iclick
+jamcam jd11 kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200
+konica konika_qm150 largan lg_gsm mars dimagev mustek panasonic_coolshot
+panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600
+polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2 ricoh ricoh_g3 samsung
+sierra sipix_blink sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55
+soundvision spca50x sq905 stv0674 stv0680 sx330z template toshiba_pdrm11"
+
+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 )"
+
+RDEPEND="${RDEPEND}
+	!<sys-fs/udev-114"
+
+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
+
+	if use cameras_template || use cameras_sipix_blink; then
+		einfo "Upstream considers sipix_blink & template driver as obsolete"
+	fi
+
+	enewgroup plugdev || die "Error creating plugdev group"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-rpm.patch
+
+	# Fix as-needed at configure time
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	AT_M4DIR="${S}/auto-m4 ${S}/m4m" eautoreconf
+}
+
+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"
+
+	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
+
+	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 version 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 version 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."
+}