version bump (#74640) thanks to Robert Davis <rdavis@unico.com>. updated libusb deps (#76282), new 2.1.5 has nousb option (#58777).

7 files changed, 150 insertions, 17 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 06ffa31ae214..2700ea0beecf 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libgphoto2
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.36 2004/10/22 23:26:51 liquidx Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.37 2005/01/13 15:37:50 liquidx Exp $
+
+*libgphoto2-2.1.5 (13 Jan 2005)
+
+  13 Jan 2005; Alastair Tse <liquidx@gentoo.org> libgphoto2-2.1.4-r1.ebuild,
+  +libgphoto2-2.1.5.ebuild:
+  version bump (#74640) thanks to Robert Davis <rdavis@unico.com>. updated
+  libusb deps (#76282), new 2.1.5 has nousb option (#58777).
 
 *libgphoto2-2.1.4-r1 (23 Oct 2004)
 
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index d57d08313a59..f1f202d0a71c 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,11 +1,12 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 27d92df2c9f172150a5a934c67643335 ChangeLog 6253
-MD5 5486abc5e535376eed3bd94b7d947b8b libgphoto2-2.1.3-r1.ebuild 3622
-MD5 4ac7382e672633492fe9b4e501c1fe72 libgphoto2-2.1.4.ebuild 3876
+MD5 d18d6b69bcb6a3ca778d3b627734dcf2 ChangeLog 6528
+MD5 dca76e7d5dd44ba9aaea92252227a3b2 libgphoto2-2.1.3-r1.ebuild 3623
+MD5 09172e5fe973f3a6273294fcf7ec083a libgphoto2-2.1.4.ebuild 3875
 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
-MD5 8027dcf31c9d2fb40112fd4b16826230 libgphoto2-2.1.4-r1.ebuild 3953
+MD5 d2bcda20118e62cca8a9fdb939fbb7e9 libgphoto2-2.1.4-r1.ebuild 3953
+MD5 70f171f5132e2b09e15305fb1f771991 libgphoto2-2.1.5.ebuild 4017
 MD5 8fc24b590738d4420bb8df6521fbbda0 files/canon.powershot.usermap 4575
 MD5 ba2eb5dbe5b2b2214d41dafc6ec6993d files/digest-libgphoto2-2.1.3-r1 70
 MD5 e396fe3bbcfd38d33ec78004f27db148 files/digest-libgphoto2-2.1.4 70
@@ -17,10 +18,11 @@ MD5 d9f7cf4aab81ea4981c30a5e313f3f8e files/libgphoto2-2.1.4-blink2.patch 1655
 MD5 3b33f744c18b1251ef1d6ce48978dd6b files/libgphoto2-2.1.4-gcc2_fixes.patch 1680
 MD5 f7704d68a87116356901f49376fa1778 files/libgphoto2-2.1.4-canon.patch 3594
 MD5 e396fe3bbcfd38d33ec78004f27db148 files/digest-libgphoto2-2.1.4-r1 70
+MD5 c1ead5696ef5db4a488f3457529e0a6c files/digest-libgphoto2-2.1.5 69
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFBeZgQRkyva5PS18kRArSIAKCLoUE5Io7M5p/Gc+VvL/Qf0Ffl9ACfQLm3
-9rxOR2+65PKeKB4+lVMdofk=
-=l4dv
+iD8DBQFB5pZERkyva5PS18kRAo+mAJ96KADMYbu59DQApHe16IqlWK7gRwCfX9Hp
+1RrjA201/P1TkD9DIS6IAnU=
+=mpI5
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.5 b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.5
new file mode 100644
index 000000000000..aaa0e0f8416b
--- /dev/null
+++ b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.5
@@ -0,0 +1 @@
+MD5 210844f0d88f58842917af6eaff06382 libgphoto2-2.1.5.tar.gz 2946757
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.3-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.3-r1.ebuild
index f10fbdbffc9f..59dbfa651c73 100644
--- a/media-libs/libgphoto2/libgphoto2-2.1.3-r1.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.1.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.3-r1.ebuild,v 1.10 2004/07/13 01:12:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.3-r1.ebuild,v 1.11 2005/01/13 15:37:50 liquidx Exp $
 
 inherit libtool eutils
 
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.4-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.4-r1.ebuild
index 387e19ca5d82..d4a46add6591 100644
--- a/media-libs/libgphoto2/libgphoto2-2.1.4-r1.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.1.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.4-r1.ebuild,v 1.1 2004/10/22 23:26:51 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.4-r1.ebuild,v 1.2 2005/01/13 15:37:50 liquidx Exp $
 
 inherit libtool eutils
 
@@ -15,7 +15,7 @@ IUSE="nls doc jpeg"
 
 # needs >usbutils-0.11-r2 to avoid /usr/lib/libusb*
 # conflicts with dev-libs/libusb
-RDEPEND=">=dev-libs/libusb-0.1.6
+RDEPEND=">=dev-libs/libusb-0.1.8
 	>=sys-apps/usbutils-0.11-r2
 	sys-apps/hotplug
 	jpeg? ( >=media-libs/libexif-0.5.9 )"
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild
index 87c591563f2f..670b2f9a5f3e 100644
--- a/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild,v 1.16 2004/10/17 11:33:16 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild,v 1.17 2005/01/13 15:37:50 liquidx Exp $
 
 inherit libtool eutils
 
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.5.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.5.ebuild
new file mode 100644
index 000000000000..36c6d8d8eae1
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.1.5.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.5.ebuild,v 1.1 2005/01/13 15:37:50 liquidx Exp $
+
+inherit libtool eutils
+
+DESCRIPTION="Library that implements support for numerous digital cameras"
+HOMEPAGE="http://www.gphoto.org/"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ia64 ~ppc64"
+IUSE="nls doc jpeg nousb"
+
+# needs >usbutils-0.11-r2 to avoid /usr/lib/libusb*
+# conflicts with dev-libs/libusb
+RDEPEND="!nousb? (>=dev-libs/libusb-0.1.8
+	>=sys-apps/usbutils-0.11-r2
+	sys-apps/hotplug)
+	jpeg? ( >=media-libs/libexif-0.5.9 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( dev-util/gtk-doc )"
+
+# By default, drivers for all supported cards will be compiled.
+# If you want to only compile for specific card(s), set CAMERAS
+# environment to a comma-separated list (no spaces) of drivers that
+# you want to build.
+IUSE_CAMERAS="agfa-cl20 aox barbie canon casio digita dimera directory enigma13 fuji gsmart300 iclick jamcam jd11
+kodak konica largan mars minolta mustek panasonic pccam300 pccam600 polaroid ptp2 ricoh samsung
+sierra sipix smal sonydscf1 sonydscf55 soundvision spca50x sq905 stv0674 stv0680 sx330z toshiba"
+
+pkg_setup() {
+	if [ -z "${CAMERAS}" ] ; then
+		ewarn "All camera drivers will be built since you did not specify"
+		ewarn "via the CAMERAS variable what camera you use."
+		einfo "libgphoto2 supports: all ${IUSE_CAMERAS}"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+        cd ${S}
+        epatch ${FILESDIR}/${PN}-2.1.2-norpm.patch
+}
+
+src_compile() {
+	local cameras
+	local cam
+	for cam in ${CAMERAS} ; do
+		has ${cam} ${IUSE_CAMERAS} && cameras="${cameras},${cam}"
+	done
+	[ -z "${cameras}" ] \
+		&& cameras="all" \
+		|| cameras="${cameras:1}"
+	einfo $cameras
+
+	elibtoolize
+
+	local myconf
+
+	myconf="--with-rpmbuild=/bin/false"
+	myconf="--with-drivers=${cameras}"
+	use jpeg \
+		&& myconf="${myconf} --with-exif-prefix=/usr" \
+		|| myconf="${myconf} --without-exif"
+	myconf="${myconf} `use_enable nls`"
+	myconf="${myconf} `use_enable doc docs`"
+	econf ${myconf} || die "econf failed"
+	# or the documentation fails.
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	if use !nousb; then 
+	make DESTDIR=${D} \
+		gphotodocdir=/usr/share/doc/${PF} \
+		HTML_DIR=/usr/share/doc/${PF}/sgml \
+		hotplugdocdir=/usr/share/doc/${PF}/linux-hotplug \
+		install || die "install failed"
+	else
+	make DESTDIR=${D} \
+		gphotodocdir=/usr/share/doc/${PF} \
+		HTML_DIR=/usr/share/doc/${PF}/sgml \
+		install || die "install failed"
+	fi
+
+	# manually move apidocs
+	if use doc; then
+		dodir /usr/share/doc/${PF}/api
+		mv ${D}/usr/share/doc/libgphoto2/html/api/* ${D}/usr/share/doc/${PF}/api/
+		mv ${D}/usr/share/doc/libgphoto2_port/html/api/* ${D}/usr/share/doc/${PF}/api/
+	fi
+	rm -rf ${D}/usr/share/doc/libgphoto2
+	rm -rf ${D}/usr/share/doc/libgphoto2_port
+
+	dodoc ChangeLog NEWS* README AUTHORS TESTERS MAINTAINERS HACKING CHANGES
+
+	# install hotplug support
+	if use !nousb; then 
+		insinto /etc/hotplug/usb
+		newins ${S}/packaging/linux-hotplug/usbcam.console usbcam
+		chmod +x ${D}/etc/hotplug/usb/usbcam
+        fi
+}
+
+pkg_postinst() {
+	if use !nousb; then
+	einfo "Generating usbcam-gphoto2.usermap .."
+	HOTPLUG_USERMAP="/etc/hotplug/usb/usbcam-gphoto2.usermap"
+	if [ -x ${ROOT}/usr/$(get_libdir)/libgphoto2/print-usb-usermap ]; then
+		echo "# !!! DO NOT EDIT THIS FILE !!! This file is automatically generated." > ${ROOT}/${HOTPLUG_USERMAP}
+		echo "# Put your custom entries in /etc/hotplug/usb/usbcam.usermap" >> ${ROOT}/${HOTPLUG_USERMAP}
+		${ROOT}/usr/$(get_libdir)/libgphoto2/print-usb-usermap >> ${ROOT}/${HOTPLUG_USERMAP}
+	else
+		eerror "Unable to find ${ROOT}/usr/$(get_libdir)/libgphoto2/print-usb-usermap"
+		eerror "and therefore unable to generate hotplug usermap."
+		eerror "You will have to manually generate it by running:"
+		eerror " /usr/$(get_libdir)/libgphoto2/print-usb-usermap > ${HOTPLUG_USERMAP}"
+	fi
+	fi
+}