public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-libs/libgphoto2: ChangeLog libgphoto2-2.4.10.ebuild
@ 2011-03-27 16:16 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 9+ messages in thread
From: Samuli Suominen (ssuominen) @ 2011-03-27 16:16 UTC (permalink / raw
  To: gentoo-commits

ssuominen    11/03/27 16:16:07

  Modified:             ChangeLog libgphoto2-2.4.10.ebuild
  Log:
  Remove support for sys-apps/hal wrt #313389.
  
  (Portage version: 2.2.0_alpha28/cvs/Linux x86_64)

Revision  Changes    Path
1.190                media-libs/libgphoto2/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.190&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.190&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?r1=1.189&r2=1.190

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- ChangeLog	22 Mar 2011 19:37:19 -0000	1.189
+++ ChangeLog	27 Mar 2011 16:16:07 -0000	1.190
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.189 2011/03/22 19:37:19 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.190 2011/03/27 16:16:07 ssuominen Exp $
+
+  27 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> libgphoto2-2.4.10.ebuild:
+  Remove support for sys-apps/hal wrt #313389.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> libgphoto2-2.4.10.ebuild:
   Marking libgphoto2-2.4.10 ppc stable for bug 353436



1.9                  media-libs/libgphoto2/libgphoto2-2.4.10.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?r1=1.8&r2=1.9

Index: libgphoto2-2.4.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- libgphoto2-2.4.10.ebuild	22 Mar 2011 19:37:19 -0000	1.8
+++ libgphoto2-2.4.10.ebuild	27 Mar 2011 16:16:07 -0000	1.9
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v 1.8 2011/03/22 19:37:19 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v 1.9 2011/03/27 16:16:07 ssuominen Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -17,7 +17,7 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="doc examples exif hal nls kernel_linux zeroconf"
+IUSE="doc examples exif nls kernel_linux zeroconf"
 
 # By default, drivers for all supported cameras will be compiled.
 # If you want to only compile for specific camera(s), set CAMERAS
@@ -55,9 +55,6 @@
 		net-dns/avahi[mdnsresponder-compat]
 		net-misc/mDNSResponder ) )
 	exif? ( >=media-libs/libexif-0.5.9 )
-	hal? (
-		>=sys-apps/hal-0.5
-		>=sys-apps/dbus-1 )
 	sys-devel/libtool"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -135,7 +132,7 @@
 		--disable-docs \
 		--disable-gp2ddb \
 		$(use_with zeroconf bonjour) \
-		$(use_with hal) \
+		--without-hal \
 		$(use_enable nls) \
 		$(use_with exif libexif auto) \
 		--with-drivers=${cameras} \
@@ -175,7 +172,6 @@
 	fi
 	# end fixup
 
-	HAL_FDI="/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi"
 	UDEV_RULES="/$(get_libdir)/udev/rules.d/70-libgphoto2.rules"
 	CAM_LIST="/usr/$(get_libdir)/libgphoto2/print-camera-list"
 
@@ -185,15 +181,6 @@
 		# Let libgphoto2 find its camera-modules
 		export CAMLIBS="${D}/usr/$(get_libdir)/libgphoto2/${PV}"
 
-		if use hal && [ -n "$("${D}"${CAM_LIST} idlist)" ]; then
-				einfo "Generating HAL FDI files ..."
-				mkdir -p "${D}"/${HAL_FDI%/*}
-				"${D}"${CAM_LIST} hal-fdi >> "${D}"/${HAL_FDI} \
-					|| die "failed to create hal-fdi"
-		elif use hal; then
-			ewarn "No HAL FDI file generated because no real camera driver enabled"
-		fi
-
 		einfo "Generating UDEV-rules ..."
 		mkdir -p "${D}"/${UDEV_RULES%/*}
 		echo -e "# do not edit this file, it will be overwritten on update\n#" \
@@ -202,10 +189,9 @@
 			|| die "failed to create udev-rules"
 	else
 		eerror "Unable to find print-camera-list"
-		eerror "and therefore unable to generate hotplug usermap or HAL FDI files."
+		eerror "and therefore unable to generate hotplug usermap."
 		eerror "You will have to manually generate it by running:"
 		eerror " ${CAM_LIST} udev-rules version 136 group plugdev > ${UDEV_RULES}"
-		eerror " ${CAM_LIST} hal-fdi > ${HAL_FDI}"
 	fi
 
 }






^ permalink raw reply	[flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libgphoto2: ChangeLog libgphoto2-2.4.10.ebuild
@ 2011-03-22 19:37 Brent Baude (ranger)
  0 siblings, 0 replies; 9+ messages in thread
From: Brent Baude (ranger) @ 2011-03-22 19:37 UTC (permalink / raw
  To: gentoo-commits

ranger      11/03/22 19:37:20

  Modified:             ChangeLog libgphoto2-2.4.10.ebuild
  Log:
  Marking libgphoto2-2.4.10 ppc for bug 353436
  
  (Portage version: 2.1.9.42/cvs/Linux ppc64)

Revision  Changes    Path
1.189                media-libs/libgphoto2/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.189&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.189&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?r1=1.188&r2=1.189

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- ChangeLog	21 Mar 2011 20:00:39 -0000	1.188
+++ ChangeLog	22 Mar 2011 19:37:19 -0000	1.189
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.188 2011/03/21 20:00:39 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.189 2011/03/22 19:37:19 ranger Exp $
+
+  22 Mar 2011; Brent Baude <ranger@gentoo.org> libgphoto2-2.4.10.ebuild:
+  Marking libgphoto2-2.4.10 ppc stable for bug 353436
 
   21 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> libgphoto2-2.4.10.ebuild:
   ppc64 stable wrt #353436



1.8                  media-libs/libgphoto2/libgphoto2-2.4.10.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?r1=1.7&r2=1.8

Index: libgphoto2-2.4.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libgphoto2-2.4.10.ebuild	21 Mar 2011 20:00:39 -0000	1.7
+++ libgphoto2-2.4.10.ebuild	22 Mar 2011 19:37:19 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v 1.7 2011/03/21 20:00:39 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v 1.8 2011/03/22 19:37:19 ranger Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -16,7 +16,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="doc examples exif hal nls kernel_linux zeroconf"
 
 # By default, drivers for all supported cameras will be compiled.






^ permalink raw reply	[flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libgphoto2: ChangeLog libgphoto2-2.4.10.ebuild
@ 2011-03-21 20:00 Kacper Kowalik (xarthisius)
  0 siblings, 0 replies; 9+ messages in thread
From: Kacper Kowalik (xarthisius) @ 2011-03-21 20:00 UTC (permalink / raw
  To: gentoo-commits

xarthisius    11/03/21 20:00:39

  Modified:             ChangeLog libgphoto2-2.4.10.ebuild
  Log:
  ppc64 stable wrt #353436
  
  (Portage version: 2.2.0_alpha27/cvs/Linux x86_64)

Revision  Changes    Path
1.188                media-libs/libgphoto2/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.188&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.188&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?r1=1.187&r2=1.188

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- ChangeLog	12 Mar 2011 20:05:55 -0000	1.187
+++ ChangeLog	21 Mar 2011 20:00:39 -0000	1.188
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.187 2011/03/12 20:05:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.188 2011/03/21 20:00:39 xarthisius Exp $
+
+  21 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> libgphoto2-2.4.10.ebuild:
+  ppc64 stable wrt #353436
 
   12 Mar 2011; Raúl Porcel <armin76@gentoo.org> libgphoto2-2.4.10.ebuild:
   alpha/ia64/sparc stable wrt #353436



1.7                  media-libs/libgphoto2/libgphoto2-2.4.10.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?r1=1.6&r2=1.7

Index: libgphoto2-2.4.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libgphoto2-2.4.10.ebuild	12 Mar 2011 20:05:55 -0000	1.6
+++ libgphoto2-2.4.10.ebuild	21 Mar 2011 20:00:39 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v 1.6 2011/03/12 20:05:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v 1.7 2011/03/21 20:00:39 xarthisius Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -16,7 +16,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~ppc ppc64 sparc x86"
 IUSE="doc examples exif hal nls kernel_linux zeroconf"
 
 # By default, drivers for all supported cameras will be compiled.






^ permalink raw reply	[flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libgphoto2: ChangeLog libgphoto2-2.4.10.ebuild
@ 2011-03-12 20:05 Raul Porcel (armin76)
  0 siblings, 0 replies; 9+ messages in thread
From: Raul Porcel (armin76) @ 2011-03-12 20:05 UTC (permalink / raw
  To: gentoo-commits

armin76     11/03/12 20:05:55

  Modified:             ChangeLog libgphoto2-2.4.10.ebuild
  Log:
  alpha/ia64/sparc stable wrt #353436
  
  (Portage version: 2.1.9.41/cvs/Linux ia64)

Revision  Changes    Path
1.187                media-libs/libgphoto2/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.187&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.187&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?r1=1.186&r2=1.187

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- ChangeLog	7 Mar 2011 20:39:34 -0000	1.186
+++ ChangeLog	12 Mar 2011 20:05:55 -0000	1.187
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.186 2011/03/07 20:39:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.187 2011/03/12 20:05:55 armin76 Exp $
+
+  12 Mar 2011; Raúl Porcel <armin76@gentoo.org> libgphoto2-2.4.10.ebuild:
+  alpha/ia64/sparc stable wrt #353436
 
   07 Mar 2011; Jeroen Roovers <jer@gentoo.org> libgphoto2-2.4.10.ebuild:
   Stable for HPPA (bug #353436).



1.6                  media-libs/libgphoto2/libgphoto2-2.4.10.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?r1=1.5&r2=1.6

Index: libgphoto2-2.4.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libgphoto2-2.4.10.ebuild	7 Mar 2011 20:39:34 -0000	1.5
+++ libgphoto2-2.4.10.ebuild	12 Mar 2011 20:05:55 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v 1.5 2011/03/07 20:39:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v 1.6 2011/03/12 20:05:55 armin76 Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -16,7 +16,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~ppc ~ppc64 sparc x86"
 IUSE="doc examples exif hal nls kernel_linux zeroconf"
 
 # By default, drivers for all supported cameras will be compiled.






^ permalink raw reply	[flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libgphoto2: ChangeLog libgphoto2-2.4.10.ebuild
@ 2011-03-07 20:39 Jeroen Roovers (jer)
  0 siblings, 0 replies; 9+ messages in thread
From: Jeroen Roovers (jer) @ 2011-03-07 20:39 UTC (permalink / raw
  To: gentoo-commits

jer         11/03/07 20:39:34

  Modified:             ChangeLog libgphoto2-2.4.10.ebuild
  Log:
  Stable for HPPA (bug #353436).
  
  (Portage version: 2.2.0_alpha26/cvs/Linux i686)

Revision  Changes    Path
1.186                media-libs/libgphoto2/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.186&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.186&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?r1=1.185&r2=1.186

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- ChangeLog	24 Feb 2011 20:35:34 -0000	1.185
+++ ChangeLog	7 Mar 2011 20:39:34 -0000	1.186
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.185 2011/02/24 20:35:34 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.186 2011/03/07 20:39:34 jer Exp $
+
+  07 Mar 2011; Jeroen Roovers <jer@gentoo.org> libgphoto2-2.4.10.ebuild:
+  Stable for HPPA (bug #353436).
 
   24 Feb 2011; Thomas Kahle <tomka@gentoo.org> libgphoto2-2.4.10.ebuild:
   x86 stable per bug 353436



1.5                  media-libs/libgphoto2/libgphoto2-2.4.10.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?r1=1.4&r2=1.5

Index: libgphoto2-2.4.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libgphoto2-2.4.10.ebuild	24 Feb 2011 20:35:34 -0000	1.4
+++ libgphoto2-2.4.10.ebuild	7 Mar 2011 20:39:34 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v 1.4 2011/02/24 20:35:34 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v 1.5 2011/03/07 20:39:34 jer Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -16,7 +16,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="doc examples exif hal nls kernel_linux zeroconf"
 
 # By default, drivers for all supported cameras will be compiled.






^ permalink raw reply	[flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libgphoto2: ChangeLog libgphoto2-2.4.10.ebuild
@ 2011-02-24 20:35 Thomas Kahle (tomka)
  0 siblings, 0 replies; 9+ messages in thread
From: Thomas Kahle (tomka) @ 2011-02-24 20:35 UTC (permalink / raw
  To: gentoo-commits

tomka       11/02/24 20:35:34

  Modified:             ChangeLog libgphoto2-2.4.10.ebuild
  Log:
  x86 stable per bug 353436
  
  (Portage version: 2.1.9.40/cvs/Linux i686)

Revision  Changes    Path
1.185                media-libs/libgphoto2/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.185&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.185&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?r1=1.184&r2=1.185

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- ChangeLog	23 Feb 2011 23:07:05 -0000	1.184
+++ ChangeLog	24 Feb 2011 20:35:34 -0000	1.185
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.184 2011/02/23 23:07:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.185 2011/02/24 20:35:34 tomka Exp $
+
+  24 Feb 2011; Thomas Kahle <tomka@gentoo.org> libgphoto2-2.4.10.ebuild:
+  x86 stable per bug 353436
 
   23 Feb 2011; Markos Chandras <hwoarang@gentoo.org> libgphoto2-2.4.10.ebuild:
   Stable on amd64 wrt bug #353436



1.4                  media-libs/libgphoto2/libgphoto2-2.4.10.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?r1=1.3&r2=1.4

Index: libgphoto2-2.4.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libgphoto2-2.4.10.ebuild	23 Feb 2011 23:07:05 -0000	1.3
+++ libgphoto2-2.4.10.ebuild	24 Feb 2011 20:35:34 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v 1.3 2011/02/23 23:07:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v 1.4 2011/02/24 20:35:34 tomka Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -16,7 +16,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="doc examples exif hal nls kernel_linux zeroconf"
 
 # By default, drivers for all supported cameras will be compiled.






^ permalink raw reply	[flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libgphoto2: ChangeLog libgphoto2-2.4.10.ebuild
@ 2011-02-23 23:07 Markos Chandras (hwoarang)
  0 siblings, 0 replies; 9+ messages in thread
From: Markos Chandras (hwoarang) @ 2011-02-23 23:07 UTC (permalink / raw
  To: gentoo-commits

hwoarang    11/02/23 23:07:05

  Modified:             ChangeLog libgphoto2-2.4.10.ebuild
  Log:
  Stable on amd64 wrt bug #353436
  
  (Portage version: 2.1.9.39/cvs/Linux x86_64)

Revision  Changes    Path
1.184                media-libs/libgphoto2/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.184&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.184&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?r1=1.183&r2=1.184

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- ChangeLog	12 Jan 2011 22:14:05 -0000	1.183
+++ ChangeLog	23 Feb 2011 23:07:05 -0000	1.184
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.183 2011/01/12 22:14:05 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.184 2011/02/23 23:07:05 hwoarang Exp $
+
+  23 Feb 2011; Markos Chandras <hwoarang@gentoo.org> libgphoto2-2.4.10.ebuild:
+  Stable on amd64 wrt bug #353436
 
   12 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org> libgphoto2-2.4.10.ebuild:
   Change selective cameras build logic. Builds all when CAMERAS is set to *,



1.3                  media-libs/libgphoto2/libgphoto2-2.4.10.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?r1=1.2&r2=1.3

Index: libgphoto2-2.4.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libgphoto2-2.4.10.ebuild	12 Jan 2011 22:14:05 -0000	1.2
+++ libgphoto2-2.4.10.ebuild	23 Feb 2011 23:07:05 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v 1.2 2011/01/12 22:14:05 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v 1.3 2011/02/23 23:07:05 hwoarang Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -16,7 +16,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc examples exif hal nls kernel_linux zeroconf"
 
 # By default, drivers for all supported cameras will be compiled.






^ permalink raw reply	[flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libgphoto2: ChangeLog libgphoto2-2.4.10.ebuild
@ 2011-01-12 22:14 Gilles Dartiguelongue (eva)
  0 siblings, 0 replies; 9+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2011-01-12 22:14 UTC (permalink / raw
  To: gentoo-commits

eva         11/01/12 22:14:05

  Modified:             ChangeLog libgphoto2-2.4.10.ebuild
  Log:
  Change selective cameras build logic. Builds all when CAMERAS is set to *, nothing if empty and only the ones specified otherwise in order to not violate package manager handling, bug #346491.
  
  (Portage version: 2.2.0_alpha13/cvs/Linux x86_64)

Revision  Changes    Path
1.183                media-libs/libgphoto2/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.183&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.183&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?r1=1.182&r2=1.183

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- ChangeLog	21 Nov 2010 22:29:53 -0000	1.182
+++ ChangeLog	12 Jan 2011 22:14:05 -0000	1.183
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libgphoto2
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.182 2010/11/21 22:29:53 eva Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.183 2011/01/12 22:14:05 eva Exp $
+
+  12 Jan 2011; Gilles Dartiguelongue <eva@gentoo.org> libgphoto2-2.4.10.ebuild:
+  Change selective cameras build logic. Builds all when CAMERAS is set to *,
+  nothing if empty and only the ones specified otherwise in order to not
+  violate package manager handling, bug #346491.
 
 *libgphoto2-2.4.10 (21 Nov 2010)
 



1.2                  media-libs/libgphoto2/libgphoto2-2.4.10.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?r1=1.1&r2=1.2

Index: libgphoto2-2.4.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libgphoto2-2.4.10.ebuild	21 Nov 2010 22:29:53 -0000	1.1
+++ libgphoto2-2.4.10.ebuild	12 Jan 2011 22:14:05 -0000	1.2
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v 1.1 2010/11/21 22:29:53 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v 1.2 2011/01/12 22:14:05 eva Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -72,10 +72,7 @@
 
 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."
-		einfo "NOTICE: Upstream will not support you if you do not compile all camera drivers first"
+		einfo "No camera drivers will be built since you did not specify any."
 	fi
 
 	if use cameras_template || use cameras_sipix_blink; then
@@ -116,17 +113,23 @@
 src_configure() {
 	local cameras
 	local cam
+	local cam_warn=no
 	for cam in ${IUSE_CAMERAS} ; do
-		use "cameras_${cam}" && cameras="${cameras},${cam}"
+		if use "cameras_${cam}"; then
+			cameras="${cameras},${cam}"
+		else
+			cam_warn=yes
+		fi
 	done
 
-	[ -z "${cameras}" ] \
-		&& cameras="all" \
-		|| cameras="${cameras:1}"
-
-	einfo "Enabled camera drivers: ${cameras}"
-	[ "${cameras}" != "all" ] && \
+	if [ "${cam_warn}" = "yes" ]; then
+		[ -z "${cameras}" ] || cameras="${cameras:1}"
+		einfo "Enabled camera drivers: ${cameras:-none}"
 		ewarn "Upstream will not support you if you do not compile all camera drivers first"
+	else
+		cameras="all"
+		einfo "Enabled camera drivers: all"
+	fi
 
 	econf \
 		--disable-docs \






^ permalink raw reply	[flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libgphoto2: ChangeLog libgphoto2-2.4.10.ebuild
@ 2010-11-21 22:29 Gilles Dartiguelongue (eva)
  0 siblings, 0 replies; 9+ messages in thread
From: Gilles Dartiguelongue (eva) @ 2010-11-21 22:29 UTC (permalink / raw
  To: gentoo-commits

eva         10/11/21 22:29:54

  Modified:             ChangeLog
  Added:                libgphoto2-2.4.10.ebuild
  Log:
  Version bump. Enable jl2005c driver since it is now considered stable. Move udev rules to /$(get_libdir)/udev/rules.d, bug #345731.
  
  (Portage version: 2.2.0_alpha4/cvs/Linux x86_64)

Revision  Changes    Path
1.182                media-libs/libgphoto2/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.182&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.182&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/ChangeLog?r1=1.181&r2=1.182

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- ChangeLog	14 Nov 2010 23:06:06 -0000	1.181
+++ ChangeLog	21 Nov 2010 22:29:53 -0000	1.182
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.181 2010/11/14 23:06:06 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.182 2010/11/21 22:29:53 eva Exp $
+
+*libgphoto2-2.4.10 (21 Nov 2010)
+
+  21 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  +libgphoto2-2.4.10.ebuild:
+  Version bump. Enable jl2005c driver since it is now considered stable. Move
+  udev rules to /$(get_libdir)/udev/rules.d, bug #345731.
 
   14 Nov 2010; Gilles Dartiguelongue <eva@gentoo.org>
   -libgphoto2-2.4.6.ebuild, -libgphoto2-2.4.8.ebuild,



1.1                  media-libs/libgphoto2/libgphoto2-2.4.10.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild?rev=1.1&content-type=text/plain

Index: libgphoto2-2.4.10.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild,v 1.1 2010/11/21 22:29:53 eva 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

EAPI="2"

inherit autotools eutils multilib

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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="doc examples exif hal nls kernel_linux zeroconf"

# By default, drivers for all supported cameras will be compiled.
# If you want to only compile for specific camera(s), set CAMERAS
# environment to a space-separated list (no commas) of drivers that
# you want to build.
IUSE_CAMERAS="
	adc65 agfa_cl20 aox ax203
	barbie
	canon casio_qv clicksmart310
	digigr8 digita dimagev dimera3500 directory
	enigma13
	fuji
	gsmart300
	hp215
	iclick
	jamcam jd11 jl2005a jl2005c
	kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150
	largan lg_gsm
	mars mustek
	panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2
	ricoh ricoh_g3
	samsung sierra sipix_blink sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z
	template toshiba_pdrm11 topfield
"

for camera in ${IUSE_CAMERAS}; do
	IUSE="${IUSE} cameras_${camera}"
done

# libgphoto2 actually links to libtool
RDEPEND="virtual/libusb:0
	cameras_ax203? ( media-libs/gd )
	cameras_st2205? ( media-libs/gd )
	zeroconf? ( || (
		net-dns/avahi[mdnsresponder-compat]
		net-misc/mDNSResponder ) )
	exif? ( >=media-libs/libexif-0.5.9 )
	hal? (
		>=sys-apps/hal-0.5
		>=sys-apps/dbus-1 )
	sys-devel/libtool"
DEPEND="${RDEPEND}
	dev-util/pkgconfig
	sys-devel/flex
	>=sys-devel/gettext-0.14.1
	doc? ( app-doc/doxygen )"
# FIXME: gtk-doc is broken
#		>=dev-util/gtk-doc-1.10 )"

RDEPEND="${RDEPEND}
	!<sys-fs/udev-136"

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."
		einfo "NOTICE: Upstream will not support you if you do not compile all camera drivers first"
	fi

	if use cameras_template || use cameras_sipix_blink; then
		einfo "Upstream considers sipix_blink & template driver as obsolete"
	fi

	enewgroup plugdev
}

src_prepare() {
	# Handle examples ourselves
	sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
		|| die "examples sed failed"

	# Fix pkgconfig file when USE="-exif"
	if ! use exif; then
		sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in || die " libgphoto2.pc sed failed"
	fi

	# Fix USE=zeroconf, bug #283332
	epatch "${FILESDIR}/${PN}-2.4.7-respect-bonjour.patch"

	# Do not build test if not running make check, bug #226241
	epatch "${FILESDIR}/${PN}-2.4.7-no-test-build.patch"

	# Increase max entries from 1024 to 8192 to fix bug #291049
	epatch "${FILESDIR}/${PN}-2.4.8-increase_max_entries.patch"

	# Fix copied libtool macro dnl problem, bug #336598
	epatch "${FILESDIR}/${PN}-2.4.9-dnl.patch"

	eautoreconf

	# Fix bug #216206, libusb detection
	sed -i "s:usb_busses:usb_find_busses:g" libgphoto2_port/configure || die "libusb sed failed"
}

src_configure() {
	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"

	econf \
		--disable-docs \
		--disable-gp2ddb \
		$(use_with zeroconf bonjour) \
		$(use_with hal) \
		$(use_enable nls) \
		$(use_with exif libexif auto) \
		--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 \
		--with-rpmbuild=$(type -P true) \
		udevscriptdir=/$(get_libdir)/udev

# FIXME: gtk-doc is currently broken
#		$(use_enable doc docs)
}

src_compile() {
	emake || die "make failed"

	if use doc; then
		doxygen doc/Doxyfile || die "Documentation generation failed"
	fi
}

src_install() {
	emake DESTDIR="${D}" install || die "install failed"

	# Clean up unwanted files
	rm "${D}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed"
	dodoc ChangeLog NEWS* README* AUTHORS TESTERS MAINTAINERS HACKING || die "dodoc failed"

	if use examples; then
		insinto /usr/share/doc/${PF}/examples
		doins examples/README examples/*.c examples/*.h || die "examples installation failed"
	fi

	# FIXME: fixup autoconf bug
	if ! use doc && [ -d "${D}/usr/share/doc/${PF}/apidocs.html" ]; then
		rm -fr "${D}/usr/share/doc/${PF}/apidocs.html"
	fi
	# end fixup

	HAL_FDI="/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi"
	UDEV_RULES="/$(get_libdir)/udev/rules.d/70-libgphoto2.rules"
	CAM_LIST="/usr/$(get_libdir)/libgphoto2/print-camera-list"

	if [ -x "${D}"${CAM_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 && [ -n "$("${D}"${CAM_LIST} idlist)" ]; then
				einfo "Generating HAL FDI files ..."
				mkdir -p "${D}"/${HAL_FDI%/*}
				"${D}"${CAM_LIST} hal-fdi >> "${D}"/${HAL_FDI} \
					|| die "failed to create hal-fdi"
		elif use hal; then
			ewarn "No HAL FDI file generated because no real camera driver enabled"
		fi

		einfo "Generating UDEV-rules ..."
		mkdir -p "${D}"/${UDEV_RULES%/*}
		echo -e "# do not edit this file, it will be overwritten on update\n#" \
			> "${D}"/${UDEV_RULES}
		"${D}"${CAM_LIST} udev-rules version 136 group plugdev >> "${D}"/${UDEV_RULES} \
			|| die "failed to create udev-rules"
	else
		eerror "Unable to find 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 " ${CAM_LIST} udev-rules version 136 group plugdev > ${UDEV_RULES}"
		eerror " ${CAM_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."
	local OLD_UDEV_RULES="${ROOT}"etc/udev/rules.d/99-libgphoto2.rules
	if [[ -f ${OLD_UDEV_RULES} ]]; then
		rm -f "${OLD_UDEV_RULES}"
	fi
}






^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2011-03-27 16:16 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-27 16:16 [gentoo-commits] gentoo-x86 commit in media-libs/libgphoto2: ChangeLog libgphoto2-2.4.10.ebuild Samuli Suominen (ssuominen)
  -- strict thread matches above, loose matches on Subject: below --
2011-03-22 19:37 Brent Baude (ranger)
2011-03-21 20:00 Kacper Kowalik (xarthisius)
2011-03-12 20:05 Raul Porcel (armin76)
2011-03-07 20:39 Jeroen Roovers (jer)
2011-02-24 20:35 Thomas Kahle (tomka)
2011-02-23 23:07 Markos Chandras (hwoarang)
2011-01-12 22:14 Gilles Dartiguelongue (eva)
2010-11-21 22:29 Gilles Dartiguelongue (eva)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox