bumping gphoto2 to stable

7 files changed, 12 insertions, 164 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 5dcb04c94cae..8c2339e3a086 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,10 @@
 # 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.11 2003/09/06 16:02:50 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.12 2003/10/08 21:29:42 liquidx Exp $
+
+  08 Oct 2003; Alastair Tse <liquidx@gentoo.org> libgphoto2-2.1.1-r3.ebuild,
+  libgphoto2-2.1.2-r1.ebuild, libgphoto2-2.1.2.ebuild:
+  stable bump and cleanup
 
 *libgphoto2-2.1.2-r1 (06 Sep 2003)
 
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 4194188ece9b..b6c16014869a 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,13 +1,9 @@
-MD5 64410867ceda782fb89379d9054c1b11 ChangeLog 2190
-MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
+MD5 c9d104b6d22e6cdcc96ef09f1c963238 ChangeLog 2349
 MD5 829031ca68853e6d35c5d4adf780d8d9 libgphoto2-2.1.1-r2.ebuild 1393
-MD5 0c5d8807c6b6a1784fa8d3a864ce5701 libgphoto2-2.1.1-r3.ebuild 1962
-MD5 59911195aff7a443d8a31f95c08619d5 libgphoto2-2.1.2.ebuild 2071
-MD5 9a55e8c0ce7ba24f4c16462d4a8ace13 libgphoto2-2.1.2-r1.ebuild 2192
+MD5 30a81588e56a2ef2ea8654a0094b3efe libgphoto2-2.1.2-r1.ebuild 2190
+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 ededea10cd8bf8a2f0d3f106c10b20ff files/libgphoto2-2.1.1-norpm.patch 533
-MD5 6376376d006db7592d2ed520086e03e7 files/digest-libgphoto2-2.1.1-r3 70
-MD5 1e1dae62e219b69ed37673f1d0fe01f9 files/digest-libgphoto2-2.1.2 70
 MD5 91db4be9fea579f0440cef2d114fcab3 files/libgphoto2-2.1.2-norpm.patch 533
-MD5 8fc24b590738d4420bb8df6521fbbda0 files/canon.powershot.usermap 4575
-MD5 1e1dae62e219b69ed37673f1d0fe01f9 files/digest-libgphoto2-2.1.2-r1 70
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.1-r3 b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.1-r3
deleted file mode 100644
index 0504917e8f6d..000000000000
--- a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.1-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ec69ffba3dc3d6a6a604fd63b3e1159e libgphoto2-2.1.1.tar.bz2 1509102
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.2 b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.2
deleted file mode 100644
index 32136093447d..000000000000
--- a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ded0d8262d02e4c215ffc0d73d5acbbb libgphoto2-2.1.2.tar.bz2 1743528
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.1-r3.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.1-r3.ebuild
deleted file mode 100644
index 1285db355e9b..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.1.1-r3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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.1-r3.ebuild,v 1.3 2003/09/11 01:17:47 msterret Exp $
-
-inherit libtool
-
-MAKEOPTS="-j1" # or the documentation fails. bah!
-
-DESCRIPTION="free, redistributable digital camera software application"
-HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
-IUSE="nls doc jpeg"
-
-RDEPEND=">=dev-libs/libusb-0.1.6
-	sys-apps/hotplug
-	jpeg? ( >=media-libs/libexif-0.5.9 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( dev-util/gtk-doc )"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-norpm.patch
-}
-
-src_compile() {
-	elibtoolize
-
-	local myconf
-
-	myconf="--with-rpmbuild=/bin/false"
-
-	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}
-}
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild
index 722e25307ffa..9ad21e284788 100644
--- a/media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2-r1.ebuild,v 1.3 2003/09/11 01:17:47 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.2-r1.ebuild,v 1.4 2003/10/08 21:29:42 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"
+KEYWORDS="x86 ~ppc ~sparc"
 IUSE="nls doc jpeg"
 
 # needs >usbutils-0.11-r2 to avoid /usr/lib/libusb* conflicts with dev-libs/libusb
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.2.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.2.ebuild
deleted file mode 100644
index c1d18d19ba95..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.1.2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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.2.ebuild,v 1.4 2003/09/11 01:17:47 msterret Exp $
-
-inherit libtool
-
-MAKEOPTS="-j1" # or the documentation fails. bah!
-
-DESCRIPTION="free, redistributable digital camera software application"
-HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
-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 )"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-norpm.patch
-}
-
-src_compile() {
-	elibtoolize
-
-	local myconf
-
-	myconf="--with-rpmbuild=/bin/false"
-
-	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}
-}