fix typo that kept usermap from being installed correctly. Bug #139650

Package-Manager: portage-2.1.1_pre2-r4

3 files changed, 15 insertions, 171 deletions

diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 61c736e201da..0a7038fed2e0 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -66,14 +66,14 @@ EBUILD libgphoto2-2.2.0.ebuild 4463 RMD160 93f5d0cc1c88c4b9a7112b17d9d9f73a608bc
 MD5 c64e1fd6b6d0ea9dc03a87b955271e6c libgphoto2-2.2.0.ebuild 4463
 RMD160 93f5d0cc1c88c4b9a7112b17d9d9f73a608bc1bf libgphoto2-2.2.0.ebuild 4463
 SHA256 421b6368e5e9e57afd5a1acb363fde02bd2723dafaaec6b2583b243d1586f246 libgphoto2-2.2.0.ebuild 4463
-EBUILD libgphoto2-2.2.1.ebuild 4823 RMD160 219c55e503a84028e2f2559be000d4725fd57015 SHA1 c10d3539afe3530690d7ae800949f7eaf781494e SHA256 5e832cf0acfabd2456d181de767fa290773261e487b59c3cb7fefeb8a0b99265
-MD5 01690c654a3bbecf972379f37822e3bc libgphoto2-2.2.1.ebuild 4823
-RMD160 219c55e503a84028e2f2559be000d4725fd57015 libgphoto2-2.2.1.ebuild 4823
-SHA256 5e832cf0acfabd2456d181de767fa290773261e487b59c3cb7fefeb8a0b99265 libgphoto2-2.2.1.ebuild 4823
-MISC ChangeLog 10450 RMD160 efda1cd04f8b5c6982f0eb7adf690d7e24599144 SHA1 a0b0ab2c62bc11cd0d16d81c2edc63a7a42ba9d6 SHA256 616556d6b877c68cbb40d5ad33fcd14cbdebdea9a2d28e919d70c06b63155af8
-MD5 165ecef66c6becc9a9355dde403798e3 ChangeLog 10450
-RMD160 efda1cd04f8b5c6982f0eb7adf690d7e24599144 ChangeLog 10450
-SHA256 616556d6b877c68cbb40d5ad33fcd14cbdebdea9a2d28e919d70c06b63155af8 ChangeLog 10450
+EBUILD libgphoto2-2.2.1-r1.ebuild 4820 RMD160 6d06ca163ab4195a538130f764982e723527f8c3 SHA1 e02997220c121aaf26a278d8515e6bc4068035de SHA256 be841fd0d24bdc54664d5be2d534bf1d14635a4ca583707b60c3cb80017c69be
+MD5 8e41a45034cbaca77033c840dc645395 libgphoto2-2.2.1-r1.ebuild 4820
+RMD160 6d06ca163ab4195a538130f764982e723527f8c3 libgphoto2-2.2.1-r1.ebuild 4820
+SHA256 be841fd0d24bdc54664d5be2d534bf1d14635a4ca583707b60c3cb80017c69be libgphoto2-2.2.1-r1.ebuild 4820
+MISC ChangeLog 10663 RMD160 76758d4512cf00e28d3ae275c444c41f399a2059 SHA1 e210b54105506ea3b0561701d821030a53d93938 SHA256 a61c4d0fdd2d96b134c9a8487106a5d3ba405770baba1d8995ec5f7cf535319d
+MD5 656962f040d88a243609ed3d7dd2d3dd ChangeLog 10663
+RMD160 76758d4512cf00e28d3ae275c444c41f399a2059 ChangeLog 10663
+SHA256 a61c4d0fdd2d96b134c9a8487106a5d3ba405770baba1d8995ec5f7cf535319d ChangeLog 10663
 MISC metadata.xml 217 RMD160 bf13a92bfaf8b11a492e3925f700beb776405f79 SHA1 4e896159ae71f6294c983df1e31772404536478d SHA256 8d9b308751481891a748c6b43b222ef52999140d5c587ba5e7464d1a8414d30a
 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
 RMD160 bf13a92bfaf8b11a492e3925f700beb776405f79 metadata.xml 217
@@ -96,13 +96,13 @@ SHA256 b35f586405aaa35bbde945d1b790625b3ff9bd2f8324fd4284671aafb4361ef5 files/di
 MD5 fcb8522f2de78f687fcb41252fb8d439 files/digest-libgphoto2-2.2.0 253
 RMD160 00cdb3caf532ca6368b41be9710e8d2c7593be73 files/digest-libgphoto2-2.2.0 253
 SHA256 3299b626e160461c7d9c7a42611ac4f10f20efdae6f25791778db5e72f25b1d8 files/digest-libgphoto2-2.2.0 253
-MD5 2a6cbda61749e6fc014bfff5f25b1492 files/digest-libgphoto2-2.2.1 253
-RMD160 d40dc6a0d1b6b95af1baeb234ef117c241c0ef63 files/digest-libgphoto2-2.2.1 253
-SHA256 bce3c4c7a08f9d9a3e8627e4bab1d096c6736d7e96b3cfa4c5e8d3886d312724 files/digest-libgphoto2-2.2.1 253
+MD5 2a6cbda61749e6fc014bfff5f25b1492 files/digest-libgphoto2-2.2.1-r1 253
+RMD160 d40dc6a0d1b6b95af1baeb234ef117c241c0ef63 files/digest-libgphoto2-2.2.1-r1 253
+SHA256 bce3c4c7a08f9d9a3e8627e4bab1d096c6736d7e96b3cfa4c5e8d3886d312724 files/digest-libgphoto2-2.2.1-r1 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.4-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFErkOkAiZjviIA2XgRAjvsAKDsa8K24xKXP8mMLFPpPsdOrcGBoQCdFSvV
-5I1saDTv4wvTE6KtQnnOrbQ=
-=uZHv
+iD8DBQFEsbWComPajV0RnrERAuRNAJ0bUDXQGjV2rS3g7Y7ga2K+60T+gQCfQmwo
+RcWRrRgGHwfqiWGbKiAQeek=
+=oDJv
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.2.1 b/media-libs/libgphoto2/files/digest-libgphoto2-2.2.1
deleted file mode 100644
index 50f7d85b42a2..000000000000
--- a/media-libs/libgphoto2/files/digest-libgphoto2-2.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c36daa4f0af59e970e1e650c10fa1ee1 libgphoto2-2.2.1.tar.gz 4474022
-RMD160 0b93ba1b6fe80c909623691f7a2452f01fa8832d libgphoto2-2.2.1.tar.gz 4474022
-SHA256 2b8bdf357283951f990a05c8ffe897f57ddfa6be2bd1eca4253c13631405c9cf libgphoto2-2.2.1.tar.gz 4474022
diff --git a/media-libs/libgphoto2/libgphoto2-2.2.1.ebuild b/media-libs/libgphoto2/libgphoto2-2.2.1.ebuild
deleted file mode 100644
index 0543a3d0e7c0..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.2.1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.2.1.ebuild,v 1.2 2006/07/07 11:20:59 flameeyes 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="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="nls doc exif usb hal"
-
-# needs >usbutils-0.11-r2 to avoid /usr/lib/libusb*
-# conflicts with dev-libs/libusb
-RDEPEND="usb? (
-		>=dev-libs/libusb-0.1.8
-		>=sys-apps/usbutils-0.11-r2
-		kernel_linux? ( sys-apps/hotplug )
-	)
-	exif? ( >=media-libs/libexif-0.5.9 )
-	hal? ( >=sys-apps/hal-0.5 )"
-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="adc65 agfa-cl20 aox barbie canon casio clicksmart310
-	digigr8 digita dimera directory enigma13 fuji gsmart300 hp215 iclick jamcam
-	jd11 kodak konica largan lg_gsm mars minolta mustek panasonic pccam300
-	pccam600 polaroid ptp2 ricoh samsung sierra sipix smal sonix sonydscf1
-	sonydscf55 soundvision spca50x sq905 stv0674 stv0680 sx330z template
-	toshiba"
-
-RESTRICT="confcache"
-
-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
-	echo
-
-	enewgroup plugdev || die "Error creating plugdev group"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-2.1.2-norpm.patch
-	epatch ${FILESDIR}/${PN}-2.2.0-includes.patch
-
-	# make default group 'plugdev', not camera
-	sed -e 's:=camera:=plugdev:' -i packaging/linux-hotplug/usbcam.group
-}
-
-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
-
-	use exif \
-		&& myconf="${myconf} --with-exif-prefix=/usr" \
-		|| myconf="${myconf} --without-exif"
-
-	econf \
-		--with-drivers=${cameras} \
-		$(use_enable nls) \
-		$(use_enable doc docs) \
-		${myconf} || die "econf failed"
-
-	# or the documentation fails.
-	emake || die "make failed"
-}
-
-src_install() {
-	if use usb && use kernel_linux; 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 usb && use kernel_linux; then
-		insinto /etc/hotplug/usb
-		newins ${S}/packaging/linux-hotplug/usbcam.group usbcam
-		chmod +x ${D}/etc/hotplug/usb/usbcam
-	fi
-
-	if [[ -x ${D}/usr/$(get_libdir)/libgphoto2/print-camera-list ]]; then
-		HOTPLUG_USERMAP="/etc/hotplug/usb/usbcam-gphoto2.usermap"
-		HAL_FDI="/usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi"
-
-		if use usb && use kernel_linux; then
-			einfo "Generating usbcam-gphoto2.usermap ..."
-			echo "# !!! DO NOT EDIT THIS FILE !!! This file is automatically generated." > ${D}/${HOTPLUG_USERMAP}
-			echo "# Put your custom entries in /etc/hotplug/usb/usbcam.usermap" >> ${D}/${HOTPLUG_USERMAP}
-			${D}/usr/$(get_libdir)/libgphoto2/print-camera-list usb-user-map >> ${D}/${HOTPLUG_USERMAP}
-
-		fi
-
-		if use hal; then
-			einfo "Generating HAL FDI files ..."
-			${D}/usr/$(get_libdir)/libgphoto2/print-camera-list hal-fdi >> ${D}/${HAL_FDI}
-		fi
-	else
-		eerror "Unable to find ${ROOT}/usr/$(get_libdir)/libgphoto2/print-camera-list"
-		eerror "and therefore unable to generate hotplug usermap or HAL FDI files."
-		eerror "You will have to manually generate it by running:"
-		eerror " /usr/$(get_libdir)/libgphoto2/print-camera-list usb-usermap > ${HOTPLUG_USERMAP}"
-		eerror " /usr/$(get_libdir)/libgphoto2/print-camera-list hal-fdi > ${HAL_FDI}"
-	fi
-
-}
-
-pkg_postinst() {
-	einfo "Don't forget to add yourself to the plugdev group "
-	einfo "if you want to be able to access your camera."
-}