[gentoo-commits] gentoo-x86 commit in media-libs/libgphoto2: libgphoto2-2.5.0.ebuild ChangeLog libgphoto2-2.4.12.ebuild

[Gilles Dartiguelongue (eva)]

eva         12/11/22 08:39:16

  Modified:             libgphoto2-2.5.0.ebuild ChangeLog
  Removed:              libgphoto2-2.4.12.ebuild
  Log:
  Add preserved_old_lib calls. Move some checks to pkg_pretend and make better use of EAPI 4. Clean up ebuild and old revision.
  
  (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key C6085806)

Revision  Changes    Path
1.5                  media-libs/libgphoto2/libgphoto2-2.5.0.ebuild

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

Index: libgphoto2-2.5.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.0.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libgphoto2-2.5.0.ebuild	4 Sep 2012 15:42:46 -0000	1.4
+++ libgphoto2-2.5.0.ebuild	22 Nov 2012 08:39:16 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.0.ebuild,v 1.4 2012/09/04 15:42:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.0.ebuild,v 1.5 2012/11/22 08:39:16 eva Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -8,7 +8,7 @@
 
 EAPI="4"
 
-inherit autotools eutils multilib user toolchain-funcs
+inherit autotools eutils multilib udev user toolchain-funcs
 
 DESCRIPTION="Library that implements support for numerous digital cameras"
 HOMEPAGE="http://www.gphoto.org/"
@@ -67,7 +67,7 @@
 RDEPEND="${RDEPEND}
 	!<sys-fs/udev-136"
 
-pkg_setup() {
+pkg_pretend() {
 	if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
 		einfo "No camera drivers will be built since you did not specify any."
 	fi
@@ -75,7 +75,9 @@
 	if use cameras_template || use cameras_sipix_blink; then
 		einfo "Upstream considers sipix_blink & template driver as obsolete"
 	fi
+}
 
+pkg_setup() {
 	enewgroup plugdev
 }
 
@@ -92,9 +94,6 @@
 	# 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"
-
 	eautoreconf
 }
 
@@ -119,9 +118,6 @@
 		einfo "Enabled camera drivers: all"
 	fi
 
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-
 	local myconf
 	use doc || myconf="ac_cv_path_DOXYGEN=false"
 	econf \
@@ -138,7 +134,7 @@
 		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		--with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \
 		--with-rpmbuild=$(type -P true) \
-		udevscriptdir="${EPREFIX}/${udevdir}" \
+		udevscriptdir="$(udev_get_udevdir)" \
 		${myconf}
 
 # FIXME: gtk-doc is currently broken
@@ -146,7 +142,7 @@
 }
 
 src_compile() {
-	emake
+	default
 
 	if use doc; then
 		doxygen doc/Doxyfile || die "Documentation generation failed"
@@ -154,7 +150,7 @@
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
 
 	# Empty dependency_libs in .la files, bug #386665
 	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
@@ -174,38 +170,46 @@
 	fi
 	# end fixup
 
-	local udevdir=/lib/udev
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
+	local udev_rules cam_list
+	udev_rules="$(udev_get_udevdir)/rules.d/70-libgphoto2.rules"
+	cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list"
 
-	UDEV_RULES="${udevdir}/rules.d/70-libgphoto2.rules"
-	CAM_LIST="/usr/$(get_libdir)/libgphoto2/print-camera-list"
-
-	if [ -x "${ED}"${CAM_LIST} ]; then
+	if [ -x "${ED}"${cam_list} ]; then
 		# Let print-camera-list find libgphoto2.so
 		export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
 		# Let libgphoto2 find its camera-modules
 		export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}"
 
 		einfo "Generating UDEV-rules ..."
-		mkdir -p "${ED}"/${UDEV_RULES%/*}
+		mkdir -p "${ED}"/${udev_rules%/*}
 		echo -e "# do not edit this file, it will be overwritten on update\n#" \
-			> "${ED}"/${UDEV_RULES}
-		"${ED}"${CAM_LIST} udev-rules version 136 group plugdev >> "${ED}"/${UDEV_RULES} \
+			> "${ED}"/${udev_rules}
+		"${ED}"${cam_list} udev-rules version 136 group plugdev >> "${ED}"/${udev_rules} \
 			|| die "failed to create udev-rules"
 	else
 		eerror "Unable to find print-camera-list"
 		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} udev-rules version 136 group plugdev > ${udev_rules}"
 	fi
 
 }
 
+pkg_preinst() {
+	preserve_old_lib \
+		/usr/$(get_libdir)/libgphoto2.so.2.4.0 \
+		/usr/$(get_libdir)/libgphoto2_port.so.0.8.0
+}
+
 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="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules
-	if [[ -f ${OLD_UDEV_RULES} ]]; then
-		rm -f "${OLD_UDEV_RULES}"
+	local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules
+	if [[ -f ${old_udev_rules} ]]; then
+		rm -f "${old_udev_rules}"
 	fi
+
+	preserve_old_lib_notify \
+		/usr/$(get_libdir)/libgphoto2.so.2.4.0 \
+		/usr/$(get_libdir)/libgphoto2_port.so.0.8.0
 }



1.222                media-libs/libgphoto2/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- ChangeLog	28 Oct 2012 16:01:48 -0000	1.221
+++ ChangeLog	22 Nov 2012 08:39:16 -0000	1.222
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.221 2012/10/28 16:01:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.222 2012/11/22 08:39:16 eva Exp $
+
+  22 Nov 2012; Gilles Dartiguelongue <eva@g.o>
+  -libgphoto2-2.4.12.ebuild, libgphoto2-2.5.0.ebuild:
+  Add preserved_old_lib calls. Move some checks to pkg_pretend and make better
+  use of EAPI 4. Clean up ebuild and old revision.
 
   28 Oct 2012; Raúl Porcel <armin76@g.o> libgphoto2-2.4.14.ebuild:
   ia64/sparc stable wrt #427544