bump to 2.4.0

Package-Manager: portage-2.1.3.9

6 files changed, 219 insertions, 9 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/Manifest b/media-libs/libgphoto2/Manifest
index 59327144a580..4c93d2fe4955 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -37,8 +37,17 @@ AUX libgphoto2-2.3.1-udev-rules-fix3.diff 1240 RMD160 2c8860703549ed7ff9bea69731
 MD5 c4f99f7bd7136261579db45b72ec8661 files/libgphoto2-2.3.1-udev-rules-fix3.diff 1240
 RMD160 2c8860703549ed7ff9bea6973126e226b097c9f2 files/libgphoto2-2.3.1-udev-rules-fix3.diff 1240
 SHA256 5f839d94b6ebe0cd10ff075e48fb61ea5d3f9d52e34e1e40e01030f29c9d40bb files/libgphoto2-2.3.1-udev-rules-fix3.diff 1240
+AUX libgphoto2-2.4.0-as-needed.patch 392 RMD160 1f8dfa33370dce7e71e129573a454f4d77f159a9 SHA1 983ec194b3df712930af17d280b98f87f91b055f SHA256 234afa509daf6f010241e58148efd7cf30c678c0b02c384e30ed0c30663fef0d
+MD5 76f8e766b5ec7b5c34b92e4492cf04b8 files/libgphoto2-2.4.0-as-needed.patch 392
+RMD160 1f8dfa33370dce7e71e129573a454f4d77f159a9 files/libgphoto2-2.4.0-as-needed.patch 392
+SHA256 234afa509daf6f010241e58148efd7cf30c678c0b02c384e30ed0c30663fef0d files/libgphoto2-2.4.0-as-needed.patch 392
+AUX libgphoto2-2.4.0-rpm.patch 452 RMD160 694c3f602a6b20fbcd135586d69551e335328f84 SHA1 ebbee5e9c4a6c1659e6fe7278733ce9b1702d430 SHA256 39501ccdfc6c780b3aa6a105584b32e9e4a6ad7195a14a341210be9f2e871149
+MD5 e99cd430f70587365b343c814f6a4ed0 files/libgphoto2-2.4.0-rpm.patch 452
+RMD160 694c3f602a6b20fbcd135586d69551e335328f84 files/libgphoto2-2.4.0-rpm.patch 452
+SHA256 39501ccdfc6c780b3aa6a105584b32e9e4a6ad7195a14a341210be9f2e871149 files/libgphoto2-2.4.0-rpm.patch 452
 DIST libgphoto2-2.2.1.tar.gz 4474022 RMD160 0b93ba1b6fe80c909623691f7a2452f01fa8832d SHA1 6636ae0020c201abaea74f9e3ea2d4bd404587c0 SHA256 2b8bdf357283951f990a05c8ffe897f57ddfa6be2bd1eca4253c13631405c9cf
 DIST libgphoto2-2.3.1.tar.bz2 3230934 RMD160 ab678a5006a89ef1fe9f052dac1f9738961cc3a8 SHA1 13cc3f05ee298b33cd03ba4b772ef05a3aa49b97 SHA256 b56433ae44e593ea0c55dd4ad69074e59151920f266dc646c1dc7e80ebe3b727
+DIST libgphoto2-2.4.0.tar.bz2 3180009 RMD160 4cba4247bd7e4f9334f2f6bda649b343007da775 SHA1 cad25aa281e0749e7f1c83a3715b421f98b0981f SHA256 0dc26b7a8568dee7634bebbaf9f7d3e3ab9460424e6297a595e41c4fddbbdb79
 EBUILD libgphoto2-2.2.1-r1.ebuild 5333 RMD160 f1c1984ad2a4c756652c9d504f41422bbaa0eee2 SHA1 b2eb82ecc3aacdc59ddc4366e77313334d62e3da SHA256 94449dcf6a33385ca50ac4f36921b15d95d470733e277ce197ba5d2223ee6174
 MD5 6b23bd3aafefe526862a0b6a06eff9b9 libgphoto2-2.2.1-r1.ebuild 5333
 RMD160 f1c1984ad2a4c756652c9d504f41422bbaa0eee2 libgphoto2-2.2.1-r1.ebuild 5333
@@ -59,10 +68,14 @@ EBUILD libgphoto2-2.3.1-r5.ebuild 5314 RMD160 1904f96dacfb257e2ba8c1e48381c45d13
 MD5 ee4c7af7f0ef38863bf594967da5c10f libgphoto2-2.3.1-r5.ebuild 5314
 RMD160 1904f96dacfb257e2ba8c1e48381c45d1345ad58 libgphoto2-2.3.1-r5.ebuild 5314
 SHA256 529626d427a24e3d0e62471c9545ddc00a1e6308dbc212424491972a96fa324f libgphoto2-2.3.1-r5.ebuild 5314
-MISC ChangeLog 17531 RMD160 82c1e983591a2be2c08978a9c2865574e68c0457 SHA1 fde6ae83a526da493d2fd0b270d3117767ad4aa4 SHA256 5ffed4848605ffd9938185c97c66859e99b0565405800a29320834f79401dde8
-MD5 445675ee90a83f3aae38271b54042061 ChangeLog 17531
-RMD160 82c1e983591a2be2c08978a9c2865574e68c0457 ChangeLog 17531
-SHA256 5ffed4848605ffd9938185c97c66859e99b0565405800a29320834f79401dde8 ChangeLog 17531
+EBUILD libgphoto2-2.4.0.ebuild 5538 RMD160 4202c3fcab033f49a845a39b3e88b766139ce5e1 SHA1 11a6f6317ee7e34dc760bd250ecda3dbad8e189a SHA256 5f78489b5354b126f4b63ed76598a3915e38b664c5a7de62efb3a21e2bc7ebc9
+MD5 670dadcb14c917f52471970255a652f3 libgphoto2-2.4.0.ebuild 5538
+RMD160 4202c3fcab033f49a845a39b3e88b766139ce5e1 libgphoto2-2.4.0.ebuild 5538
+SHA256 5f78489b5354b126f4b63ed76598a3915e38b664c5a7de62efb3a21e2bc7ebc9 libgphoto2-2.4.0.ebuild 5538
+MISC ChangeLog 17738 RMD160 dae521e7e12d4531e83bf974a63cfe178e4a6437 SHA1 986f3fc91f55b50777a16d644a0f117789bf09ae SHA256 535fea2f744e1f46f3157b2aa70e97a1ea9b5cae43348f6f78cf25427fb9bf41
+MD5 8ec36155bc18e05b7719220542304e9b ChangeLog 17738
+RMD160 dae521e7e12d4531e83bf974a63cfe178e4a6437 ChangeLog 17738
+SHA256 535fea2f744e1f46f3157b2aa70e97a1ea9b5cae43348f6f78cf25427fb9bf41 ChangeLog 17738
 MISC metadata.xml 182 RMD160 5f49130c67eb53fd2c6ebe0de1fc022095660261 SHA1 5ae56f5c257c146dfe43fd8556cf742e79758f3a SHA256 6ce4ccce668fc2a8c0598e348462ae041f477022bd8bc407c7c5e4ba98eabc5b
 MD5 7f9a9f03e32d907819c6891242037f7c metadata.xml 182
 RMD160 5f49130c67eb53fd2c6ebe0de1fc022095660261 metadata.xml 182
@@ -82,10 +95,13 @@ SHA256 cbf2aa1737eebc645f214359a686607a97e3d963a12c425f439b020fb56330c9 files/di
 MD5 f59a564d9acf40c03e04fbadc8f52b1d files/digest-libgphoto2-2.3.1-r5 256
 RMD160 02bfc9e1c415b30e127ea38588f08e83c22beb73 files/digest-libgphoto2-2.3.1-r5 256
 SHA256 cbf2aa1737eebc645f214359a686607a97e3d963a12c425f439b020fb56330c9 files/digest-libgphoto2-2.3.1-r5 256
+MD5 fe1406182385e3183e892136f820991a files/digest-libgphoto2-2.4.0 256
+RMD160 7d12c514df1bf2257fbc731880580bddc5b0ec6c files/digest-libgphoto2-2.4.0 256
+SHA256 f1c96a5b69af736e43e71fd4a9c4eb20cca97bb5b699a8276b1d70c7139af2f4 files/digest-libgphoto2-2.4.0 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFG1ru2yuNVb5qfaOYRAuonAJ9CLNcjYeib8ar+CvraK0QUFqD76wCgooDA
-oTpjq/6eP/hX8Zv2bRssdJM=
-=e40A
+iD8DBQFG+D5j1fmVwcYIWAYRAtHSAKCPM6UionVM1zv696DIcbDL3k94eACg6a/S
+T86oKReLwIzL55ZRBgcmytY=
+=1Rsa
 -----END PGP SIGNATURE-----
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."
+}