Bump to 2.4.4. Lot of changes on PTP2 driver and bug fixes.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

3 files changed, 221 insertions, 2 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 04c84958c7d8..c9e505587852 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.141 2009/01/25 17:17:21 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.142 2009/01/31 16:10:17 eva Exp $
+
+*libgphoto2-2.4.4 (31 Jan 2009)
+
+  31 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +libgphoto2-2.4.4.ebuild:
+  Bump to 2.4.4. Lot of changes on PTP2 driver and bug fixes.
 
   25 Jan 2009; Tobias Klausmann <klausman@gentoo.org>
   libgphoto2-2.4.3.ebuild:
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 8a37fb2f68e6..ee3645f6303b 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gphoto2-ixany.patch 533 RMD160 84c48af39a8e843765816060656132a4dd467b22 SHA1 2021fdc650a29c0faef13d5feba91ba635fc3d00 SHA256 abaffc4911b4cc60b0df55ad7055a0a71b2b1d79390ba21a20dd9c911954ffca
 AUX libgphoto2-2.4.0-as-needed.patch 392 RMD160 1f8dfa33370dce7e71e129573a454f4d77f159a9 SHA1 983ec194b3df712930af17d280b98f87f91b055f SHA256 234afa509daf6f010241e58148efd7cf30c678c0b02c384e30ed0c30663fef0d
 AUX libgphoto2-2.4.0-rpm.patch 452 RMD160 694c3f602a6b20fbcd135586d69551e335328f84 SHA1 ebbee5e9c4a6c1659e6fe7278733ce9b1702d430 SHA256 39501ccdfc6c780b3aa6a105584b32e9e4a6ad7195a14a341210be9f2e871149
@@ -7,8 +10,17 @@ AUX libgphoto2-2.4.3-gcc43.patch 518 RMD160 d7e97ebe24b021ec6cdf8e9cc6372349ca23
 DIST libgphoto2-2.4.1.tar.bz2 3493514 RMD160 1671698eec9a1de601de5423d887e8a238a6f41b SHA1 acff08c45e2a69cde2646c321e6140ccd19f1951 SHA256 dbb78d2eaf7c06ada10be244589835e683d3a0b4fb20494bff850a5762286bab
 DIST libgphoto2-2.4.2.tar.bz2 3444898 RMD160 3e5562fabdc67ec493248b4afc0853510da3a1c0 SHA1 bde7a9e78e4342878f11b493b53eca5b69107de9 SHA256 f319655b272186ad76ab73317b7e8c5e3b87d51c1265ce676f02e8c312745226
 DIST libgphoto2-2.4.3.tar.bz2 5172531 RMD160 9ab2af4c8fb2cd1ed2ff6c58b32a5529285bbb69 SHA1 4fd95a933baec20ef1264b841dde5864fd00d982 SHA256 d4c1c7e7f4b35ffe4104161fdd8fe8ca9f0723c525a65b8685d808fdf833db42
+DIST libgphoto2-2.4.4.tar.bz2 5252280 RMD160 bdb26313f1b5b2b425a7ed13bfe10a3f04488209 SHA1 a1d881e27231037bb860b952560cec36ce6a8988 SHA256 2582362ae318b62c31832edfcaf401397fcc98fd307347ee15babff94770784d
 EBUILD libgphoto2-2.4.1-r1.ebuild 5924 RMD160 7347f9e16a7cfce6acbf66c333128a4ce34eedfb SHA1 1165cbeb499f8a9461f42e58adeea146e24e01a3 SHA256 c530968b0d3b35669a9354955888a323ba6372d37e2941066dd3a02cd4cb909b
 EBUILD libgphoto2-2.4.2.ebuild 6069 RMD160 900ccf62ab3fe29a4a8126d02a94aa3d45ab9cf1 SHA1 2d076cfa907cfcc6e7b62668929425ffac101f21 SHA256 e020897b9016fa1984a8b9ec8d8d519825b124161bb654cc9fab0fceea5a0b14
 EBUILD libgphoto2-2.4.3.ebuild 6390 RMD160 22394242fc5fb3b169615a362fe3bacc71c8660e SHA1 d8d9fb4cb1355d8ea7b1c1b70dd237cb91829426 SHA256 cfd56bb78b60fc6f635efe5703c2f1e7974de92f26104d649cd63c26af8b1d18
-MISC ChangeLog 23396 RMD160 be0256757daa93db0c97fe645d4d54f08cd86d2e SHA1 c922c10b9051d2acb18e564e63066a48231deafe SHA256 4a2ccf8ce2b11a09e90d7c564516ffd85afb981552d9945257b50dbca959a9a0
+EBUILD libgphoto2-2.4.4.ebuild 6359 RMD160 7e0959bdbbbfce361aa3dc11e79c56d8b829d364 SHA1 12dc55ff56b1a8cf9827108a028a474ceee24383 SHA256 9fe2d67af4b8d282902b929fe384e8f4c916c11196cb48ac1335361595aaff19
+MISC ChangeLog 23569 RMD160 d24da6a0306a939d70d2bbbb9af6f3679f36e33f SHA1 4043243cb5d8a2e167b457346e1511f3343d1188 SHA256 75b0395a266f3cca7d057ae5c495dec7922a1f4fc64db25901a06604232ae880
 MISC metadata.xml 255 RMD160 182d44452574b19b29c12dc7e757a2a4aa9cbc20 SHA1 7e912f6a5b9a294509849512ba044bd88b59065f SHA256 d2cc84bd8e8d171980c022b0af42cf2f2d829e37c05183988a211fccafcf363b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmEhfwACgkQ1fmVwcYIWAZCYQCgpeN+Vw5YjsWgL9jWfzm70a0l
+w78AoKsXLmDAnz5W0gjW5raJbuvzU5E8
+=3lw5
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libgphoto2/libgphoto2-2.4.4.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.4.ebuild
new file mode 100644
index 000000000000..d1dafd315c55
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.4.4.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.4.ebuild,v 1.1 2009/01/31 16:10:17 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
+# 3. Track upstream bug regarding rpm usage.
+#	http://sourceforge.net/tracker/index.php?func=detail&aid=1643813&group_id=8874&atid=358874
+
+EAPI="2"
+
+inherit autotools 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="bonjour doc exif hal nls 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_qv clicksmart310
+digigr8 digita dimera3500 directory enigma13 fuji gsmart300 hp215 iclick
+jamcam jd11 jl2005a kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200
+konica konica_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
+topfield"
+
+# jl2005c is still experimental -> not enabled
+
+for camera in ${IUSE_CAMERAS}; do
+	IUSE="${IUSE} cameras_${camera}"
+done
+
+# libgphoto2 actually links to libtool
+RDEPEND=">=dev-libs/libusb-0.1.8
+	bonjour? ( || (
+		net-dns/avahi[mdnsresponder-compat]
+		net-misc/mDNSResponder ) )
+	exif? ( >=media-libs/libexif-0.5.9 )
+	hal? (
+		>=sys-apps/hal-0.5
+		>=sys-apps/dbus-1 )
+	sys-devel/libtool"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/flex
+	>=sys-devel/gettext-0.14.1
+	doc? ( app-doc/doxygen )"
+# FIXME: gtk-doc is broken
+#		>=dev-util/gtk-doc-1.10 )"
+
+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
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.4.0-rpm.patch
+
+	# Fix pkgconfig file when USE="-exif"
+	use exif || sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in || die " libgphoto2.pc sed failed"
+
+	# Fix bug #216206, libusb detection
+	sed -i "s:usb_busses:usb_find_busses:g" libgphoto2_port/configure || die "libusb sed failed"
+
+	# Fix building on alpha, bug #221853 comment #6
+	epatch "${FILESDIR}/gphoto2-ixany.patch"
+
+	# Fix automagic dependencies, bug #242470
+	epatch "${FILESDIR}/${PN}-2.4.3-automagic.patch"
+
+	cd "${S}/libgphoto2_port"
+	eautoreconf
+}
+
+src_configure() {
+	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-libexif=/usr" \
+		|| myconf="${myconf} --with-libexif=no"
+
+	econf \
+		${myconf} \
+		--disable-docs \
+		--disable-gp2ddb \
+		$(use_enable bonjour) \
+		$(use_enable hal) \
+		$(use_enable nls) \
+		--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 \
+		--with-rpmbuild=/bin/true \
+		udevscriptdir=/$(get_libdir)/udev
+
+# FIXME: gtk-doc is currently broken
+#		$(use_enable doc docs)
+}
+
+src_compile() {
+	emake || die "make failed"
+
+	if use doc; then
+		doxygen doc/Doxyfile || die "Documentation generation failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	# FIXME: fixup autoconf bug
+	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/20thirdparty/10-camera-libgphoto2.fdi"
+	UDEV_RULES="/etc/udev/rules.d/70-libgphoto2.rules"
+	CAM_LIST="/usr/$(get_libdir)/libgphoto2/print-camera-list"
+
+	if [ -x "${D}"${CAM_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 && [ -n "$("${D}"${CAM_LIST} idlist)" ]; then
+				einfo "Generating HAL FDI files ..."
+				mkdir -p "${D}"/${HAL_FDI%/*}
+				"${D}"${CAM_LIST} hal-fdi >> "${D}"/${HAL_FDI} \
+					|| die "failed to create hal-fdi"
+		else
+			ewarn "No HAL FDI file generated because no real camera driver enabled"
+		fi
+
+		einfo "Generating UDEV-rules ..."
+		mkdir -p "${D}"/${UDEV_RULES%/*}
+		echo -e "# do not edit this file, it will be overwritten on update\n#" \
+			> "${D}"/${UDEV_RULES}
+		"${D}"${CAM_LIST} udev-rules version 0.98 group plugdev >> "${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 " ${CAM_LIST} udev-rules version 0.98 group plugdev > ${UDEV_RULES}"
+		eerror " ${CAM_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."
+	local OLD_UDEV_RULES="${ROOT}"etc/udev/rules.d/99-libgphoto2.rules
+	if [[ -f ${OLD_UDEV_RULES} ]]; then
+		rm -f "${OLD_UDEV_RULES}"
+	fi
+}