version bump (#31566)

4 files changed, 113 insertions, 2 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 7d1796b9e785..82c6c0bf74a9 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.16 2003/10/27 02:17:29 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.17 2003/10/28 17:21:12 liquidx Exp $
+
+*libgphoto2-2.1.3 (28 Oct 2003)
+
+  28 Oct 2003; Alastair Tse <liquidx@gentoo.org> libgphoto2-2.1.3.ebuild:
+  version bump, removed canon patch and added support for GPHOTO_LIBS
+  environment variable to support optional restriction to driver compilation.
+  this is similar to ALSA_CARDS used in alsa-kernel. thanks to Robert Davis
+  <rdavis@uniformcompany.com> (#31566)
 
   26 Oct 2003; Brad House <brad_mssw@gentoo.org> libgphoto2-2.1.2-r1.ebuild:
   add ~amd64 flag
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 6489adb56fd7..8f96d156068f 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,10 +1,12 @@
-MD5 d48413701dec8c5c9c4dc37274d339f6 ChangeLog 2851
+MD5 7f2c3c5fc14f7aba4fd5907b84a2c4a7 ChangeLog 3220
 MD5 829031ca68853e6d35c5d4adf780d8d9 libgphoto2-2.1.1-r2.ebuild 1393
 MD5 7efad34697645c9ef5fda0b3657f2fe1 libgphoto2-2.1.2-r1.ebuild 2276
+MD5 2f6a2c4ad4852c32457ce9f80143d248 libgphoto2-2.1.3.ebuild 2889
 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
 MD5 8fc24b590738d4420bb8df6521fbbda0 files/canon.powershot.usermap 4575
 MD5 6376376d006db7592d2ed520086e03e7 files/digest-libgphoto2-2.1.1-r2 70
 MD5 1e1dae62e219b69ed37673f1d0fe01f9 files/digest-libgphoto2-2.1.2-r1 70
+MD5 ba2eb5dbe5b2b2214d41dafc6ec6993d files/digest-libgphoto2-2.1.3 70
 MD5 ededea10cd8bf8a2f0d3f106c10b20ff files/libgphoto2-2.1.1-norpm.patch 533
 MD5 e860333a276c3461b4fc8cfdd0b09263 files/libgphoto2-2.1.2-canon.patch 4929
 MD5 91db4be9fea579f0440cef2d114fcab3 files/libgphoto2-2.1.2-norpm.patch 533
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.3 b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.3
new file mode 100644
index 000000000000..2bef17c44e3f
--- /dev/null
+++ b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.3
@@ -0,0 +1 @@
+MD5 af200308629fcbe0b88d3802bba04779 libgphoto2-2.1.3.tar.bz2 1797303
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.3.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.3.ebuild
new file mode 100644
index 000000000000..5918f0133119
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.1.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.3.ebuild,v 1.1 2003/10/28 17:21:12 liquidx Exp $
+
+inherit libtool
+
+MAKEOPTS="${MAKEOPTS} -j1" # or the documentation fails.
+
+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="~x86 ~ppc ~sparc ~amd64"
+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
+	>=sys-apps/usbutils-0.11-r2
+	sys-apps/hotplug
+	jpeg? ( >=media-libs/libexif-0.5.9 )"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.5.9
+	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 GPHOTO_LIBS
+# environment to a comma-separated list (no spaces) of drivers that 
+# you want to build.
+#
+# For example:
+#
+#   env GPHOTO_LIBS='canon,ptp2' emerge libgphoto2
+#
+# drivers: agfa-cl20, barbie, canon, casio, digita, dimera,
+#          directory, fuji, gsmart300, jamcam,
+#          jd11, kodak, konica, mustek, largan,
+#          minolta, panasonic, pccam300, pccam600,
+#          polaroid, ptp2, ricoh, samsung, smal,
+#          sierra, sipix, sonydscf1, sonydscf55,
+#          soundvision, spca50x, sq905, stv0680, sx330z
+#
+[ -z "${GPHOTO_LIBS}" ] && GPHOTO_LIBS="all"
+
+
+src_unpack() {
+	unpack ${A}
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.1.2-norpm.patch
+}
+
+src_compile() {
+	elibtoolize
+
+	local myconf
+
+	myconf="--with-rpmbuild=/bin/false"
+
+	myconf="--with-drivers=${GPHOTO_LIBS}"
+
+	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}
+	emake || die "make failed"
+}
+
+src_install() {
+	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"
+
+	# manually move apidocs
+	if [ -n "`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
+	insinto /etc/hotplug/usb
+	newins ${S}/packaging/linux-hotplug/usbcam.console usbcam
+	chmod +x ${D}/etc/hotplug/usb/usbcam
+
+	HOTPLUG_USERMAP="${D}/etc/hotplug/usb/usbcam.usermap"
+	${D}/usr/lib/libgphoto2/print-usb-usermap >> ${HOTPLUG_USERMAP}
+}