cleanup

Package-Manager: portage-2.0.51.22-r1

5 files changed, 3 insertions, 238 deletions

diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index edae05db2422..1d9f6cf19d06 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -2,14 +2,11 @@
 Hash: SHA1
 
 MD5 68e95624087a362717ff48946d1eb90a ChangeLog 6994
-MD5 dca76e7d5dd44ba9aaea92252227a3b2 libgphoto2-2.1.3-r1.ebuild 3623
 MD5 9bdc55dbb224488ada58de4d1d8fd2aa libgphoto2-2.1.4.ebuild 3872
 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
-MD5 d2bcda20118e62cca8a9fdb939fbb7e9 libgphoto2-2.1.4-r1.ebuild 3953
 MD5 772936918d9fc3192d110af788c0b60f libgphoto2-2.1.5.ebuild 4014
 MD5 931d357b649076f15dc2a9fdd659f929 libgphoto2-2.1.6.ebuild 4019
 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
 MD5 ededea10cd8bf8a2f0d3f106c10b20ff files/libgphoto2-2.1.1-norpm.patch 533
 MD5 e860333a276c3461b4fc8cfdd0b09263 files/libgphoto2-2.1.2-canon.patch 4929
@@ -18,13 +15,12 @@ MD5 1a200bb63548924b958987cd87c45dda files/libgphoto2-2.1.3-canon.patch 8487
 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
 MD5 b99fd4203cf4ad0c3b53222749d3b06f files/digest-libgphoto2-2.1.6 69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCvB/ATM53OX+9xmMRAhIVAKDMgBhxp3qPukKZDILzAkIJtgWxqgCfXPsh
-/Yu/2hLDF72KXZPvqXzQSwA=
-=4k2m
+iD8DBQFCvCCQTM53OX+9xmMRAhvzAJ9h/1sCDPG61bhBtq4Mt/v0LiUtlwCfaN87
+SzjxkHzzsUQE1Ez9nLb5qu4=
+=3ImG
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.3-r1 b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.3-r1
deleted file mode 100644
index 2bef17c44e3f..000000000000
--- a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af200308629fcbe0b88d3802bba04779 libgphoto2-2.1.3.tar.bz2 1797303
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.4-r1 b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.4-r1
deleted file mode 100644
index 9244e6b04166..000000000000
--- a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 59dbfa651c73..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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.11 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.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc ~amd64 ia64"
-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
-	# canon camera ids backported from CVS (bug #35624)
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-2.1.3-canon.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} || die "econf failed"
-	# or the documentation fails.
-	emake -j1 || 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 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
-}
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.4-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.4-r1.ebuild
deleted file mode 100644
index d4a46add6591..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.1.4-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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.2 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.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ia64 ~ppc64"
-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.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 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"
-
-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
-	# add stylcam snap support (#52932)
-	epatch ${FILESDIR}/${PN}-2.1.4-blink2.patch
-	# Fix compilation under gcc-2.
-	epatch ${FILESDIR}/${P}-gcc2_fixes.patch
-	# add more canon cameras (#67238)
-	epatch ${FILESDIR}/${P}-canon.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() {
-	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 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/$(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
-}