version bump (#38713)

5 files changed, 126 insertions, 6 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index c819e765f04b..ee83c1d71b1e 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,12 @@
 # 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.20 2004/01/09 03:33:25 liquidx Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.21 2004/02/01 22:53:41 liquidx Exp $
+
+*libgphoto2-2.1.4 (01 Feb 2004)
+
+  01 Feb 2004; Alastair Tse <liquidx@gentoo.org> libgphoto2-2.1.3-r1.ebuild,
+  libgphoto2-2.1.4.ebuild:
+  version bump (#38713)
 
 *libgphoto2-2.1.3-r1 (09 Jan 2004)
 
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 4a87a07cf0e9..975e6a57d49b 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,14 +1,16 @@
-MD5 434ad60942ede9a7c1f29644cd3c8416 ChangeLog 3911
+MD5 27b51222620eeea85765eccf2b79c911 ChangeLog 4073
 MD5 829031ca68853e6d35c5d4adf780d8d9 libgphoto2-2.1.1-r2.ebuild 1393
 MD5 de22849ddbd381dd81fb8a5af66405e8 libgphoto2-2.1.2-r1.ebuild 2271
-MD5 e3dac9ee74b25b3ba200467c1ca96ca0 libgphoto2-2.1.3-r1.ebuild 3636
+MD5 c5bc84bdaf08e985a317fa9bcf472f55 libgphoto2-2.1.3-r1.ebuild 3635
 MD5 5e5e03775967a095c9c01bfc58e488ee libgphoto2-2.1.3.ebuild 2890
+MD5 fed399cb5191ce721b589fa03b59ed78 libgphoto2-2.1.4.ebuild 3489
 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 ba2eb5dbe5b2b2214d41dafc6ec6993d files/digest-libgphoto2-2.1.3-r1 70
+MD5 e396fe3bbcfd38d33ec78004f27db148 files/digest-libgphoto2-2.1.4 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.4 b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.4
new file mode 100644
index 000000000000..9244e6b04166
--- /dev/null
+++ b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.4
@@ -0,0 +1 @@
+MD5 a201650482bbc2edbd948449cf4d3f5a libgphoto2-2.1.4.tar.bz2 1819325
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.3-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.3-r1.ebuild
index 14f5cdb9cf16..d1438ce1aaef 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 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-r1.ebuild,v 1.2 2004/01/09 03:35:02 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.3-r1.ebuild,v 1.3 2004/02/01 22:53:41 liquidx Exp $
 
 inherit libtool
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
 IUSE="nls doc jpeg"
 
 # needs >usbutils-0.11-r2 to avoid /usr/lib/libusb* 
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild
new file mode 100644
index 000000000000..9646f71a7c45
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2004 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.4.ebuild,v 1.1 2004/02/01 22:53:41 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}
+	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
+}
+
+pkg_postinst() {
+	einfo "Generating usbcam-gphoto2.usermap .."
+	HOTPLUG_USERMAP="/etc/hotplug/usb/usbcam-gphoto2.usermap"
+	if [ -x ${ROOT}/usr/lib/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/lib/libgphoto2/print-usb-usermap >> ${ROOT}/${HOTPLUG_USERMAP}
+	else
+		eerror "Unable to find ${ROOT}/usr/lib/libgphoto2/print-usb-usermap"
+		eerror "and therefore unable to generate hotplug usermap."
+		eerror "You will have to manually generate it by running:"
+		eerror " /usr/lib/libgphoto2/print-usb-usermap > ${HOTPLUG_USERMAP}"
+	fi
+}