Add new bug to track, cleanup

Package-Manager: portage-2.1.2-r5

5 files changed, 16 insertions, 184 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 031c0cd431ac..9131fefe2a9a 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.91 2007/01/31 15:53:38 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.92 2007/01/31 18:52:49 alonbl Exp $
+
+  31 Jan 2007; Alon Bar-Lev <alonbl@gentoo.org> -libgphoto2-2.3.1-r1.ebuild,
+  libgphoto2-2.3.1-r2.ebuild:
+  Add new bug to track, cleanup
 
 *libgphoto2-2.3.1-r2 (31 Jan 2007)
 
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 67fc480697bf..d26ec858a73a 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX canon.powershot.usermap 4575 RMD160 d280ac90745b440133b33d203dfd121cf31c5b96 SHA1 4a57170205f4a7393a3686f7e29a4567da832aa8 SHA256 93cfa9d2028cab38de7c4f89d46c929313b3bca4120bafb8bbcf5747c3169f3a
 MD5 8fc24b590738d4420bb8df6521fbbda0 files/canon.powershot.usermap 4575
 RMD160 d280ac90745b440133b33d203dfd121cf31c5b96 files/canon.powershot.usermap 4575
@@ -37,7 +34,7 @@ AUX libgphoto2-2.3.1-udev-rules-fix.diff 1297 RMD160 a1d97352cd972244a2f0b064f20
 MD5 34a9403d2e3afc7288e5b955ed16c406 files/libgphoto2-2.3.1-udev-rules-fix.diff 1297
 RMD160 a1d97352cd972244a2f0b064f207ee100f39ac69 files/libgphoto2-2.3.1-udev-rules-fix.diff 1297
 SHA256 3afe2338a99b45bcb91af872eff4f24710b2178d94aa38c5d998df972279698d files/libgphoto2-2.3.1-udev-rules-fix.diff 1297
-DIST libgphoto2-2.1.6.tar.gz 3205731 RMD160 ef32357d9722a69d20a02098bd30c13165c27e6a SHA1 22be325303fa10a4a3f519d71b25364b3f84d653 SHA256 f80dc7b4b280db736b07089e31aefc8112a47e285e7d0b4f53249630a07fec80
+DIST libgphoto2-2.1.6.tar.gz 3205731 RMD160 ef32357d9722a69d20a02098bd30c13165c27e6a SHA256 f80dc7b4b280db736b07089e31aefc8112a47e285e7d0b4f53249630a07fec80
 DIST libgphoto2-2.2.1.tar.gz 4474022 RMD160 0b93ba1b6fe80c909623691f7a2452f01fa8832d SHA1 6636ae0020c201abaea74f9e3ea2d4bd404587c0 SHA256 2b8bdf357283951f990a05c8ffe897f57ddfa6be2bd1eca4253c13631405c9cf
 DIST libgphoto2-2.3.1.tar.bz2 3230934 RMD160 ab678a5006a89ef1fe9f052dac1f9738961cc3a8 SHA1 13cc3f05ee298b33cd03ba4b772ef05a3aa49b97 SHA256 b56433ae44e593ea0c55dd4ad69074e59151920f266dc646c1dc7e80ebe3b727
 EBUILD libgphoto2-2.1.6-r1.ebuild 4502 RMD160 304650ab9a3562b8506f409ba0572b2400f4e572 SHA1 24d8d6c545ab84eb207ad749f5e21073299c7c1a SHA256 80e1b40afa4029a8ea226142f7790483b65f524d4e3679e91ecc1345e154b735
@@ -48,18 +45,14 @@ EBUILD libgphoto2-2.2.1-r1.ebuild 5543 RMD160 64b18721e07f878524c5b8e703bb619ba1
 MD5 696e963901bbee33a456eb31a563ba3b libgphoto2-2.2.1-r1.ebuild 5543
 RMD160 64b18721e07f878524c5b8e703bb619ba1922b62 libgphoto2-2.2.1-r1.ebuild 5543
 SHA256 4780b2f04698df770e0967469e3faabcf063b0d4abe2bbaae72bd481f8d5e8ec libgphoto2-2.2.1-r1.ebuild 5543
-EBUILD libgphoto2-2.3.1-r1.ebuild 5041 RMD160 4a5839a2007aa3ccf4f7c439e574f027107dd9d4 SHA1 24115c7fe93d1653748be0147c302b2ebb63d32a SHA256 fd9a5d3843b3fad67dd90890582288acc90aa4550b548c70fd2d7423276b1e9c
-MD5 75e7c41af1d9df749a91be00b42d912f libgphoto2-2.3.1-r1.ebuild 5041
-RMD160 4a5839a2007aa3ccf4f7c439e574f027107dd9d4 libgphoto2-2.3.1-r1.ebuild 5041
-SHA256 fd9a5d3843b3fad67dd90890582288acc90aa4550b548c70fd2d7423276b1e9c libgphoto2-2.3.1-r1.ebuild 5041
-EBUILD libgphoto2-2.3.1-r2.ebuild 5129 RMD160 6e49c7813f0b8f99abc2431f1ddca7b409e00478 SHA1 b32bd0acb5db3f97503e0ba0ffe545780b95277a SHA256 62cad28ae9195bccefd3bf96e874f18f04894fb81954eec7c4340fbb5cde3852
-MD5 42fd79bbcc3961f41ffc88f13e218419 libgphoto2-2.3.1-r2.ebuild 5129
-RMD160 6e49c7813f0b8f99abc2431f1ddca7b409e00478 libgphoto2-2.3.1-r2.ebuild 5129
-SHA256 62cad28ae9195bccefd3bf96e874f18f04894fb81954eec7c4340fbb5cde3852 libgphoto2-2.3.1-r2.ebuild 5129
-MISC ChangeLog 14809 RMD160 1cd3b5647808563f0d06148fdb2afe0d081bf387 SHA1 dff8f02069cd1a874966f06af851e386fb67fa3b SHA256 921f3bc602da703d8ccf54b66da7a18fd0945237c1263d3eae0fec8fb5a9c7e0
-MD5 77359fd21bdf5d2e375dc8b85cab1a69 ChangeLog 14809
-RMD160 1cd3b5647808563f0d06148fdb2afe0d081bf387 ChangeLog 14809
-SHA256 921f3bc602da703d8ccf54b66da7a18fd0945237c1263d3eae0fec8fb5a9c7e0 ChangeLog 14809
+EBUILD libgphoto2-2.3.1-r2.ebuild 5222 RMD160 29d2d7c05f32b814100e1f53f1bc7d1e0588e560 SHA1 f392c925ae58ca96bd1f01bff0c586d3623ed245 SHA256 6001d95071f362a9301a70b8495fbb29a49e7674dfa3425cbbaca97d8132a347
+MD5 88450a45519d068ee7b9ddebed40624a libgphoto2-2.3.1-r2.ebuild 5222
+RMD160 29d2d7c05f32b814100e1f53f1bc7d1e0588e560 libgphoto2-2.3.1-r2.ebuild 5222
+SHA256 6001d95071f362a9301a70b8495fbb29a49e7674dfa3425cbbaca97d8132a347 libgphoto2-2.3.1-r2.ebuild 5222
+MISC ChangeLog 14949 RMD160 d2b990b6a9f8cbaf090905239570672f65f552d3 SHA1 0b9cba129033f706df2312d70b35fd2ce89a7011 SHA256 fecdc87ae4d070e44f2502984e1c98dfe9201c7a30c6fb328bcc0a803cac9c1f
+MD5 5adee81f00b20a47c5db728d444112a8 ChangeLog 14949
+RMD160 d2b990b6a9f8cbaf090905239570672f65f552d3 ChangeLog 14949
+SHA256 fecdc87ae4d070e44f2502984e1c98dfe9201c7a30c6fb328bcc0a803cac9c1f ChangeLog 14949
 MISC metadata.xml 273 RMD160 ba47ae4270a03bdca07255550d34c988816001bf SHA1 5edf5229a614bb7b9667d0dc64d455f9c282fa56 SHA256 a6bef8cc7f89558f4236d2a7507e97e966e38b31c8dffcd65f7a428f5fe96623
 MD5 7e59357e866fde5180e2184134acafdc metadata.xml 273
 RMD160 ba47ae4270a03bdca07255550d34c988816001bf metadata.xml 273
@@ -70,16 +63,6 @@ SHA256 b35f586405aaa35bbde945d1b790625b3ff9bd2f8324fd4284671aafb4361ef5 files/di
 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
-MD5 f59a564d9acf40c03e04fbadc8f52b1d files/digest-libgphoto2-2.3.1-r1 256
-RMD160 02bfc9e1c415b30e127ea38588f08e83c22beb73 files/digest-libgphoto2-2.3.1-r1 256
-SHA256 cbf2aa1737eebc645f214359a686607a97e3d963a12c425f439b020fb56330c9 files/digest-libgphoto2-2.3.1-r1 256
 MD5 f59a564d9acf40c03e04fbadc8f52b1d files/digest-libgphoto2-2.3.1-r2 256
 RMD160 02bfc9e1c415b30e127ea38588f08e83c22beb73 files/digest-libgphoto2-2.3.1-r2 256
 SHA256 cbf2aa1737eebc645f214359a686607a97e3d963a12c425f439b020fb56330c9 files/digest-libgphoto2-2.3.1-r2 256
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFwLuboeSe8B0zEfwRAo/DAJ4p5PEpAXix5HXgGCXIg6NHKhxdBwCeNc1g
-afFQc7TB6LrlOT8LIBaGfG0=
-=H629
------END PGP SIGNATURE-----
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r1 b/media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r1
deleted file mode 100644
index 770cf01bd000..000000000000
--- a/media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 37f85e34e5b6031ddf6cac8b8782ac4f libgphoto2-2.3.1.tar.bz2 3230934
-RMD160 ab678a5006a89ef1fe9f052dac1f9738961cc3a8 libgphoto2-2.3.1.tar.bz2 3230934
-SHA256 b56433ae44e593ea0c55dd4ad69074e59151920f266dc646c1dc7e80ebe3b727 libgphoto2-2.3.1.tar.bz2 3230934
diff --git a/media-libs/libgphoto2/libgphoto2-2.3.1-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.3.1-r1.ebuild
deleted file mode 100644
index 84c9756d315f..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.3.1-r1.ebuild,v 1.3 2007/01/30 19:57:28 alonbl Exp $
-
-# TODO
-# 1. Track upstream bug --disable-docs does not work.
-#	http://sourceforge.net/tracker/index.php?func=detail&aid=1643870&group_id=8874&atid=108874
-# 2. Track upstream bug udevscriptdir does not work.
-#	http://sourceforge.net/tracker/index.php?func=detail&aid=1646520&group_id=8874&atid=108874
-# 3. Track upstream bug regarding rpm usage.
-#	http://sourceforge.net/tracker/index.php?func=detail&aid=1643813&group_id=8874&atid=358874
-
-inherit 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="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="nls doc exif hal kernel_linux"
-RESTRICT="test"
-
-# 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"
-
-for camera in ${IUSE_CAMERAS}; do
-	IUSE="${IUSE} cameras_${camera}"
-done
-
-RDEPEND="exif? ( >=media-libs/libexif-0.5.9 )
-	hal? ( >=sys-apps/hal-0.5 )
-	sys-devel/libtool"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-	if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
-		einfo "libgphoto2 supports: all ${IUSE_CAMERAS}"
-		einfo "All camera drivers will be built since you did not specify"
-		einfo "via the CAMERAS variable what camera you use."
-		ewarn "NOTICE: Upstream will not support you if you do not compile all camera drivers first"
-	fi
-
-	enewgroup plugdev || die "Error creating plugdev group"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-rpm.patch"
-}
-
-src_compile() {
-	local cameras
-	local cam
-	for cam in ${IUSE_CAMERAS} ; do
-		use "cameras_${cam}" && cameras="${cameras},${cam}"
-	done
-	[ -z "${cameras}" ] \
-		&& cameras="all" \
-		|| cameras="${cameras:1}"
-
-	einfo "Enabled camera drivers: ${cameras}"
-	[ "${cameras}" != "all" ] && \
-		ewarn "Upstream will not support you if you do not compile all camera drivers first"
-
-	CFLAGS="${CFLAGS} -DCANON_EXPERIMENTAL_20D"
-
-	local myconf
-
-	use exif \
-		&& myconf="${myconf} --with-exif-prefix=/usr" \
-		|| myconf="${myconf} --without-exif"
-
-	econf \
-		--with-drivers=${cameras} \
-		--with-doc-dir=/usr/share/doc/${PF} \
-		--with-html-dir=/usr/share/doc/${PF}/html \
-		--with-hotplug-doc-dir=/usr/share/doc/${PF}/hotplug \
-		$(use_enable nls) \
-		--with-rpmbuild=/bin/true \
-		--disable-docs \
-		udevscriptdir=/lib/udev \
-		GTKDOC=/bin/true \
-		${myconf} || die "econf failed"
-#		$(use_enable doc docs) \	TODO
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR=${D} install || die "install failed"
-
-	# fixup autoconf bug TODO
-	if ! use doc && [ -d ${D}/usr/share/doc/${PF}/apidocs.html ]; then
-		rm -fr "${D}/usr/share/doc/${PF}/apidocs.html"
-	fi
-	# end fixup
-
-	# fixup udevscriptdir is not working TODO
-	dodir /lib
-	mv "${D}/usr/lib/udev" "${D}/lib"
-	# end fixup
-
-	dodoc ChangeLog NEWS* README AUTHORS TESTERS MAINTAINERS HACKING
-
-	HAL_FDI="/usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi"
-	UDEV_RULES="/etc/udev/rules.d/99-libgphoto2.rules"
-
-	if [ -x ${D}/usr/$(get_libdir)/libgphoto2/print-camera-list ]; then
-		# Let print-camera-list find libgphoto2.so
-		export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)"
-		# Let libgphoto2 find its camera-modules
-		export CAMLIBS="${D}/usr/$(get_libdir)/libgphoto2/${PV}"
-
-		if use hal; then
-			einfo "Generating HAL FDI files ..."
-			mkdir -p ${D}/${HAL_FDI%/*}
-			${D}/usr/$(get_libdir)/libgphoto2/print-camera-list hal-fdi >> ${D}/${HAL_FDI} \
-				|| die "failed to create hal-fdi"
-		fi
-
-		einfo "Generating UDEV-rules ..."
-		mkdir -p ${D}/${UDEV_RULES%/*}
-		${D}/usr/$(get_libdir)/libgphoto2/print-camera-list \
-			udev-rules-0.98	group plugdev mode 0660 >> ${D}/${UDEV_RULES} \
-			|| die "failed to create udev-rules"
-	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 udev-rules-0.98 group plugdev mode 0660 > ${UDEV_RULES}"
-		eerror " /usr/$(get_libdir)/libgphoto2/print-camera-list hal-fdi > ${HAL_FDI}"
-	fi
-
-}
-
-pkg_postinst() {
-	elog "Don't forget to add yourself to the plugdev group "
-	elog "if you want to be able to access your camera."
-}
-
diff --git a/media-libs/libgphoto2/libgphoto2-2.3.1-r2.ebuild b/media-libs/libgphoto2/libgphoto2-2.3.1-r2.ebuild
index d84853de3acd..55186e5b1763 100644
--- a/media-libs/libgphoto2/libgphoto2-2.3.1-r2.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.3.1-r2.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.3.1-r2.ebuild,v 1.1 2007/01/31 15:53:38 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.3.1-r2.ebuild,v 1.2 2007/01/31 18:52:49 alonbl Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
 #	http://sourceforge.net/tracker/index.php?func=detail&aid=1643870&group_id=8874&atid=108874
 # 2. Track upstream bug udevscriptdir does not work.
 #	http://sourceforge.net/tracker/index.php?func=detail&aid=1646520&group_id=8874&atid=108874
+#	http://sourceforge.net/tracker/index.php?func=detail&aid=1648346&group_id=8874&atid=108874
 # 3. Track upstream bug regarding rpm usage.
 #	http://sourceforge.net/tracker/index.php?func=detail&aid=1643813&group_id=8874&atid=358874