freebsd compat thanks to flameeyes (#102353)

(Portage version: 2.1_pre3-r1)

4 files changed, 146 insertions, 47 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 8315a116ed69..6e91bc6cda73 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.62 2006/02/07 20:53:45 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.63 2006/02/10 13:17:51 liquidx Exp $
+
+*libgphoto2-2.1.6-r2 (10 Feb 2006)
+
+  10 Feb 2006; Alastair Tse <liquidx@gentoo.org>
+  +libgphoto2-2.1.6-r2.ebuild:
+  freebsd compat thanks to flameeyes (#102353)
 
   07 Feb 2006; Aron Griffis <agriffis@gentoo.org>
   libgphoto2-2.1.6-r1.ebuild:
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index e9406c5c2747..0faead212b74 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,64 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 911f54119290af48a56df6da88f3273a ChangeLog 9431
-RMD160 37a3a3ea26b72f53a35dbad12a03d30f65a80282 ChangeLog 9431
-SHA256 27c8e0248146c491d0c9c3a1486749b219937bb9808e15b912b98eb92c46097c ChangeLog 9431
 MD5 8fc24b590738d4420bb8df6521fbbda0 files/canon.powershot.usermap 4575
-RMD160 d280ac90745b440133b33d203dfd121cf31c5b96 files/canon.powershot.usermap 4575
-SHA256 93cfa9d2028cab38de7c4f89d46c929313b3bca4120bafb8bbcf5747c3169f3a files/canon.powershot.usermap 4575
 MD5 e396fe3bbcfd38d33ec78004f27db148 files/digest-libgphoto2-2.1.4 70
-RMD160 3f31290b98d6425a6bc51c7ea6ba95152566d6ae files/digest-libgphoto2-2.1.4 70
-SHA256 d5967c98def1937cd7f1c4a19450e5c794f7d7a3e56fc5ec6fb24118bd92abd4 files/digest-libgphoto2-2.1.4 70
 MD5 c1ead5696ef5db4a488f3457529e0a6c files/digest-libgphoto2-2.1.5 69
-RMD160 3544d1e93557bb1e5fde13ab3bc685ee4963fb86 files/digest-libgphoto2-2.1.5 69
-SHA256 2b9c1187f119eb4d900f549a084ae108c0c7c1ce787856b43b52811fe35670d1 files/digest-libgphoto2-2.1.5 69
 MD5 b99fd4203cf4ad0c3b53222749d3b06f files/digest-libgphoto2-2.1.6 69
-RMD160 56a8c33701764afc956011b73fbb14eea36e0c6c files/digest-libgphoto2-2.1.6 69
-SHA256 edb6bb40a321fb0b25f9e3100e4939c246c1765a5e167cf386c55d00bf535b5f files/digest-libgphoto2-2.1.6 69
 MD5 e729f21d2d7315567aa5895385835473 files/digest-libgphoto2-2.1.6-r1 253
-RMD160 c15c020d0155430cbed480b7e00dee02efefff39 files/digest-libgphoto2-2.1.6-r1 253
-SHA256 b35f586405aaa35bbde945d1b790625b3ff9bd2f8324fd4284671aafb4361ef5 files/digest-libgphoto2-2.1.6-r1 253
+MD5 b99fd4203cf4ad0c3b53222749d3b06f files/digest-libgphoto2-2.1.6-r2 69
 MD5 ededea10cd8bf8a2f0d3f106c10b20ff files/libgphoto2-2.1.1-norpm.patch 533
-RMD160 b95889c0197ab166bafa2c4d010b513e07f67dce files/libgphoto2-2.1.1-norpm.patch 533
-SHA256 957a22cbc7ea37df68702992013788fac93acea4d3994a23f1b082bb14a56b29 files/libgphoto2-2.1.1-norpm.patch 533
 MD5 e860333a276c3461b4fc8cfdd0b09263 files/libgphoto2-2.1.2-canon.patch 4929
-RMD160 8c9227b4da915452a445b2b6d06d1c4fcd167586 files/libgphoto2-2.1.2-canon.patch 4929
-SHA256 905cb2c591081d54e5418330c5eb4dfa45fa44c693029924eeee973b6781c340 files/libgphoto2-2.1.2-canon.patch 4929
 MD5 91db4be9fea579f0440cef2d114fcab3 files/libgphoto2-2.1.2-norpm.patch 533
-RMD160 27e5f2d00256c9361809f423ad3dc711d300d04f files/libgphoto2-2.1.2-norpm.patch 533
-SHA256 51203b8094834cc17901d041c6d4c65119d6dec4259856c14f7cf57d291b2c65 files/libgphoto2-2.1.2-norpm.patch 533
 MD5 1a200bb63548924b958987cd87c45dda files/libgphoto2-2.1.3-canon.patch 8487
-RMD160 e44c17928e1f5ea3ab71601c3ca31453226cec03 files/libgphoto2-2.1.3-canon.patch 8487
-SHA256 1b60549d6b607ac80791038c499cbfd7818797d14c4edc8985c35de0020738de files/libgphoto2-2.1.3-canon.patch 8487
 MD5 d9f7cf4aab81ea4981c30a5e313f3f8e files/libgphoto2-2.1.4-blink2.patch 1655
-RMD160 a3244550d499cff8737f47fb59df945203a2e1cb files/libgphoto2-2.1.4-blink2.patch 1655
-SHA256 deb8658751520a48446603689ff889f517cb2c6c77a6154816b14afaec72a063 files/libgphoto2-2.1.4-blink2.patch 1655
 MD5 f7704d68a87116356901f49376fa1778 files/libgphoto2-2.1.4-canon.patch 3594
-RMD160 a5bc325006db2a13ac4790100842499854879adb files/libgphoto2-2.1.4-canon.patch 3594
-SHA256 fbb6268d2affc9df3ef0ea2b759e8a4ca6431e4e854d938008d161de5f067545 files/libgphoto2-2.1.4-canon.patch 3594
 MD5 3b33f744c18b1251ef1d6ce48978dd6b files/libgphoto2-2.1.4-gcc2_fixes.patch 1680
-RMD160 68f9ded2e70a973a8cd4e4c2ea2820ee337f99f8 files/libgphoto2-2.1.4-gcc2_fixes.patch 1680
-SHA256 b626415c5ba5fcd7dd8048a30787dd367555f7835a33bae69b6038698f10bccd files/libgphoto2-2.1.4-gcc2_fixes.patch 1680
 MD5 9bdc55dbb224488ada58de4d1d8fd2aa libgphoto2-2.1.4.ebuild 3872
-RMD160 5e402219f1a8c559a68ea0566a5241813cb23c15 libgphoto2-2.1.4.ebuild 3872
-SHA256 eaf0e93a92eef919d897c69358d18427d09e23c323a18d883d94af239f523dea libgphoto2-2.1.4.ebuild 3872
 MD5 84b14458116bed8e0c301719b08005a5 libgphoto2-2.1.5.ebuild 4011
-RMD160 a825490ca40f84a766763ff6d261727af6bb90ab libgphoto2-2.1.5.ebuild 4011
-SHA256 19e7da76482451be07387f4a5089e18232b7dba448ef92cd74945b6771b7342a libgphoto2-2.1.5.ebuild 4011
 MD5 21ce16f2fabc38fc6642509539130a9d libgphoto2-2.1.6-r1.ebuild 4415
-RMD160 e2724108abc6ce50f86fec4abbd9f398a59d8c92 libgphoto2-2.1.6-r1.ebuild 4415
-SHA256 16e56206cf3ef0efcc474c6f18063e8672de260220e1d84cb960b1340ca73a30 libgphoto2-2.1.6-r1.ebuild 4415
+MD5 f6c225504ec25fca72bd68f144553e2f libgphoto2-2.1.6-r2.ebuild 4351
 MD5 09e03121ecd86f34ca1d457b262fcc66 libgphoto2-2.1.6.ebuild 4097
-RMD160 ab27eb404f02e8ceebf22e14e3f1b46a6474e35e libgphoto2-2.1.6.ebuild 4097
-SHA256 358bf78bb5035a856e79b94ac9af6c9c1920f94b27f6111b8d014d336aa03c8f libgphoto2-2.1.6.ebuild 4097
 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
-RMD160 bf13a92bfaf8b11a492e3925f700beb776405f79 metadata.xml 217
-SHA256 8d9b308751481891a748c6b43b222ef52999140d5c587ba5e7464d1a8414d30a metadata.xml 217
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD6QjiJrHF4yAQTrARAlr0AJ9uQQD/xPtNWmNiHvL8QJ+GJeWPlwCdEjrR
-FtfFuFOizHyvNoUe6QLUj98=
-=n64e
------END PGP SIGNATURE-----
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.6-r2 b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.6-r2
new file mode 100644
index 000000000000..906a369c0f89
--- /dev/null
+++ b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.6-r2
@@ -0,0 +1 @@
+MD5 1938cbd9718595fd419907bf2f7c3195 libgphoto2-2.1.6.tar.gz 3205731
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.6-r2.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.6-r2.ebuild
new file mode 100644
index 000000000000..1e10676153e1
--- /dev/null
+++ b/media-libs/libgphoto2/libgphoto2-2.1.6-r2.ebuild
@@ -0,0 +1,136 @@
+# 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.1.6-r2.ebuild,v 1.1 2006/02/10 13:17:51 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.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls doc exif nousb"
+
+# needs >usbutils-0.11-r2 to avoid /usr/lib/libusb*
+# conflicts with dev-libs/libusb
+RDEPEND="!nousb? (
+		>=dev-libs/libusb-0.1.8
+		>=sys-apps/usbutils-0.11-r2
+		kernel_linux? ( sys-apps/hotplug )
+	)
+	exif? ( >=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="adc65 agfa-cl20 aox barbie canon casio digita dimera directory enigma13 fuji gsmart300 iclick jamcam jd11
+kodak konica largan mars minolta mustek panasonic pccam300 pccam600 polaroid ptp2 ricoh samsung
+sierra sipix smal sonydscf1 sonydscf55 soundvision spca50x sq905 stv0674 stv0680 sx330z toshiba"
+
+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
+
+	# 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 -j1 || die "make failed"
+}
+
+src_install() {
+	if use !nousb && 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 !nousb && use kernel_linux; then
+		insinto /etc/hotplug/usb
+		newins ${S}/packaging/linux-hotplug/usbcam.group usbcam
+		chmod +x ${D}/etc/hotplug/usb/usbcam
+	fi
+}
+
+pkg_postinst() {
+	if use !nousb && use kernel_linux; then
+		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
+	fi
+
+	einfo "Don't forget to add yourself to the plugdev group "
+	einfo "if you want to be able to access your camera."
+}