Apply important fixes: solve libxml2 detection, update configure options, rely on udev >= 175, update cameras (#484276 by Nikoli and Evgeny Bobkin, also solving #484276 by Michael Rowell); drop old.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 79 insertions, 19 deletions

diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index fe5c3da91d63..402819a70968 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.238 2013/10/10 18:40:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.239 2013/11/22 20:59:58 pacho Exp $
+
+*libgphoto2-2.5.2-r1 (22 Nov 2013)
+
+  22 Nov 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/libgphoto2-2.5.2-libxml2-detection.patch,
+  +files/libgphoto2-2.5.2-libxml2-detection2.patch, +libgphoto2-2.5.2-r1.ebuild,
+  -libgphoto2-2.5.2.ebuild:
+  Apply important fixes: solve libxml2 detection, update configure options, rely
+  on udev >= 175, update cameras (#484276 by Nikoli and Evgeny Bobkin, also
+  solving #484276 by Michael Rowell); drop old.
 
   10 Oct 2013; Pacho Ramos <pacho@gentoo.org> -libgphoto2-2.5.1.1.ebuild,
   libgphoto2-2.5.2.ebuild:
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index eb4d0bf4e753..264147e02a72 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -5,16 +5,18 @@ AUX libgphoto2-2.4.7-no-test-build.patch 910 SHA256 a5d7ab59c51bb9751ade66082844
 AUX libgphoto2-2.4.7-respect-bonjour.patch 643 SHA256 00b09825d9b6493a2a65577c6bf0b2a5549c6901b8b5fb839f886d989e29c055 SHA512 c6e07ffdfc8f81cee8624ce67df0480ca2fa98df1748906393ca196c73e11a482e62f59d1eb5bedc05ea3bb754ffdf4c23f4ed7f3a9d9264fbf81ed6554f4ead WHIRLPOOL 09a39eda0a3d40a8402b5483aa24d567b0da53926c7fcd85aebaca4a2510020fd8b273405d8407815f27ca1c57ab734565fe6b11fff158c9909391021c1008f2
 AUX libgphoto2-2.4.8-increase_max_entries.patch 477 SHA256 596ab7c4edc7573044e89ac548505b82de18f791616126273ff4fe13c935b4f8 SHA512 9a23b5b1787e1582a984dc096be3365c2a372ece8dfefa42d1ef05e5ce92ff26fc3562ff04da06766df69b0d587fdece5252c706abd4c57a556e6fb2257c8614 WHIRLPOOL b354a40426e6f731e57adf85ae11e1f9c87154dc48d6149e3e33887df60427e06bb907a8878d56427b7eb8211b7f5b1228b9d758ac4230fd47f214f82546d721
 AUX libgphoto2-2.4.9-dnl.patch 471 SHA256 6f657277d3262d8295b35d5bd49c79a229fef5a9b587191d9e1a91ed73564bf5 SHA512 85d6dd60c81f4b0c76894576483afa851fc3d4c7ff3644853a1db3147395ba5980b19dc4452094387a41fe26d3ab09a342f24acabcbf9d23e07c0f32e895327c WHIRLPOOL 168f23c3e2b720e2b4a1b9459ab5c10ace825d6f312a1bbcc93e139df0cb51759acaf3341d64cc51e39a4aecadbe5382f2f1b2f44a572ca8bea4e2c28a6e0ea2
+AUX libgphoto2-2.5.2-libxml2-detection.patch 1157 SHA256 cc99141f7467067325edeac8d14ec4a6c912817cdde181e078974e35435391a8 SHA512 bb874494a9b4718da96f9f5f9dc9a283623d0cb85c33fc23ce75c4739a23a6afc46f5ca3d6ca65afc17ef1f0d80631307f8b3fea56052ceb9103e052de850061 WHIRLPOOL 06bc555f7b1c56ed5cc8db1f25fcd682c49f5b64fe908de16fd30aeb469a414c62c4ca60c003cd44338ef31fc0e2dac3f5a6a58b600c32d51ec93093de4c7a2d
+AUX libgphoto2-2.5.2-libxml2-detection2.patch 579 SHA256 1f8270cd93e43cb5c55b6ba335a5b4d5f6ce3aad5d079e10001e727231322d03 SHA512 f1afb74da896def6ba16630bef187be405ebc91e87964bdd542632ef5a25afd7f2f2c9ee30914f0b811b74db7b29afaee23ed23d19ab4ee54d35d1bf6dfef50f WHIRLPOOL 6db454ffea7c4c7cab28b6a642f0b3188c18cab821fb867d5ff9b149d9145c04289e81a76cae5882fd2c3d532819c8e70747cb7479ee0a3197708cbb3022453f
 DIST libgphoto2-2.4.14.tar.bz2 4481384 SHA256 59b32d45252f67d066cc3bda7a59f8078e0cf4e7f23590a4b621633e81060292 SHA512 4abc89ee2d714deab98cdba84d0497b7262105ade3b3c43eaa8936b6e5359a8dc50c49c217fff37f013e0ce7404b82b4c7c2f90af49274a3ecb9f15e10747a73 WHIRLPOOL 0b9674c93f62cd060fc2134816b8dfd809e9276b8ffd943b9856ca57fac319dc4201aeab71a267a1d547bfcc7c4e80cd97d8a9d37528e16703adb57084630faf
 DIST libgphoto2-2.5.2.tar.bz2 6446235 SHA256 a32d113555bcb59e332b33ca00f28878b5a6151edb7f18735daee81d280a2838 SHA512 f572fc6bdcb6a6363ad3ad7ac86fdd401c1d86ce82497d36c2b3c6ca6242b880e72246d8fe3e9624ecb813b3c0b123bd14adf2d1bf69a2bee3a0e837b0a4a527 WHIRLPOOL 23db9e272f3d6038c1c7eb019996eceb67a1afbbda54d7101bcc3ccb44d3bebccdd836430aac5d6c7757f55fb544256ee3cf029304b9a9a493832b0fe11979a8
 EBUILD libgphoto2-2.4.14-r1.ebuild 6232 SHA256 bcc43b9153506a6ec3f11dc61fd995c8e19a0c4cd743d2163ea99610c6faa7bc SHA512 c2d49f6143076ce6acc3ddeca0acbc5af0f436f0dc5ca410f68d75f9739557ac718eb9b88beff384139c9da94f12ef34f7875490eb5ceab7f852cf232837f074 WHIRLPOOL c8d843b8ad3f7cd0d54e6f10357f578801eb2145a746b72847cd062370e4c9dd30011bd813a952b3d13af2afe1b5b2d60a9383f05513a5cae38cd2512245f832
-EBUILD libgphoto2-2.5.2.ebuild 6361 SHA256 fe274fc9fd7aef97bf86b90f28a3a1ad01efcc57a6f4b622dca4e1ac75b778bd SHA512 41cdee83d0f0b1c853fd79581888d0334b6b37001eea85df326c81689b94a19d5985ca240ee607eb2038a01fbd475c5a3146e74ef7f79930a742722145b33b00 WHIRLPOOL 5ae03cf7d3b0a0a5054c10f3b404ded149cc72176031282eb7403196edd57b49db7ff53fa77de14b45c3f7083576ae3bfb1383836acace92f8fc7b9775b3545f
-MISC ChangeLog 38115 SHA256 3d66e54c3242e4d69040a34a06dd858d8a88296535237520f0461ef7a5f7040a SHA512 b9afc05f68148d6075011916ec66693a142d79cbf1e9cbc5e46f3c3fe370bd8005addd8ddcfe6011c7388785d6b25c5b8906afc74f48c9bbe6fd43d97b4da25c WHIRLPOOL fd34bbdf7beb632a7304bf15d3f53cca4671f7269551f12d610e935e4d70464ea16dc81544d194338d75747eb1f0d47e8a5e7cb4a49a10dc93b1f1af9d098e0e
+EBUILD libgphoto2-2.5.2-r1.ebuild 6472 SHA256 7fd8459844b74093ad6080445ed003f83dabdd05f2112da002be7d77eaf3c072 SHA512 18f43801f832a37db387a51da33920e376bb5a3ad780f3461708b3c88493e8803821732805e490a9820b24d636e20432442594bb7a014530baa40547a05efba8 WHIRLPOOL 3f1edda892287a76cb78b6498d971431de177ba013538cc2b9c1a6f540b03ce821927d494c209f833650bb4d23ff02f5678fd33f493df8d8b83ea0c15e374b45
+MISC ChangeLog 38563 SHA256 c9125c6c6818639167c7b2078c00df1b9d240c8f9a9852ab86dbabb91ac7e9ea SHA512 98722997d6b73e25c236ce35a0a8088fd9c17c64cb160229065d79d3454d4f3d6db551c78cde32a373c823673471f1053bc533d56968e408cba1770332dd1a4f WHIRLPOOL 0c04cd462838e95139cabed00fbb55d54bdca1e6855aa55f548beb6dc8117ee5f9a3e366ccc81dd9ee8b9780022a2a6af179fea77a2bd1d378f41513cb173be9
 MISC metadata.xml 182 SHA256 6ce4ccce668fc2a8c0598e348462ae041f477022bd8bc407c7c5e4ba98eabc5b SHA512 6b61b8de171da5556ddf719a13a0053fdf6d26c891f6c7ffedebe51c3f88f6d2b15451e43819705841c6818d3a5cf4d2466c92b5a1ee654ca6e5de7436570859 WHIRLPOOL 5487cc56cd31c1326162f3b15018e1d43a0e42086480ee53f6893e8eeee63a27bbec99844f3de3d40ea8e6ab6721087831f398b761ea0c827ce56e4e1473b8f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJW9KUACgkQCaWpQKGI+9S8TACdH9Dw1U5Cq8koqte1XvBEnxI9
-yeMAnRB4t9PbkRXYNz4BMLU0Fa8bDU2P
-=cnpa
+iEYEAREIAAYFAlKPxc8ACgkQCaWpQKGI+9SnuwCghBeCo4NAKpFqQlgLMScoGY3K
+HkUAnjrgTdbGS0XFkB+1vc774DsqCVf8
+=FfUo
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection.patch b/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection.patch
new file mode 100644
index 000000000000..54f539f58f2a
--- /dev/null
+++ b/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection.patch
@@ -0,0 +1,30 @@
+--- a/trunk/libgphoto2/configure.ac
++++ b/trunk/libgphoto2/configure.ac
+@@ -273,22 +273,14 @@
+ GP_CONFIG_MSG([JPEG mangling support],[${libjpeg_msg}])
+ 
+ dnl ---------------------------------------------------------------------------
+-dnl check for libxml22
+-dnl ---------------------------------------------------------------------------
+-LIBXML2=""
+-libxml2_msg="no"
+-AC_SUBST(LIBXML2)
+-AC_ARG_WITH([libxml2], AS_HELP_STRING([--without-libxml2], [Build without libxml2 library (default: no)]))
+-AS_IF([test "x$with_libxml2" != "xno"], [
+-	AC_CHECK_LIB(xml2,xmlFirstElementChild,[
+-		AC_CHECK_HEADER(libxml/parser.h,[
+-			AC_DEFINE(HAVE_LIBXML2,1,[define if we found LIBXML2 and its headers])
+-			LIBXML2="-lxml2"
+-			libxml2_msg="yes"
+-		])
+-	])
+-])
+-GP_CONFIG_MSG([LIBXML2 to support Olympus E remote control],[${libxml2_msg}])
++dnl check for libxml2
++dnl ---------------------------------------------------------------------------
++GP_CONFIG_MSG([libxml2 support])
++GP_CHECK_LIBRARY([LIBXML2],[libxml-2.0],[>= 2.0],
++                [libxml/parser.h],[xmlFirstElementChild],[],[],
++                [default-on],
++                [http://xmlsoft.org]
++)
diff --git a/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection2.patch b/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection2.patch
new file mode 100644
index 000000000000..a2d326bcd495
--- /dev/null
+++ b/media-libs/libgphoto2/files/libgphoto2-2.5.2-libxml2-detection2.patch
@@ -0,0 +1,16 @@
+--- a/trunk/libgphoto2/camlibs/ptp2/Makefile-files
++++ b/trunk/libgphoto2/camlibs/ptp2/Makefile-files
+@@ -4,6 +4,7 @@
+ 
+ EXTRA_LTLIBRARIES += ptp2.la
+ 
++ptp2_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) $(LIBXML2_CFLAGS)
+ ptp2_la_SOURCES = \
+ 	ptp2/ptp.c ptp2/ptp.h \
+ 	ptp2/library.c ptp2/usb.c ptp2/ptp-bugs.h \
+@@ -12,4 +13,4 @@
+ 	ptp2/olympus-wrap.c ptp2/olympus-wrap.h
+ ptp2_la_LDFLAGS = $(camlib_ldflags)
+ ptp2_la_DEPENDENCIES = $(camlib_dependencies)
+-ptp2_la_LIBADD = $(camlib_libadd) $(LTLIBICONV) $(LIBXML2)
++ptp2_la_LIBADD = $(camlib_libadd) $(LTLIBICONV) $(LIBXML2_LIBS)
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.2.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.2-r1.ebuild
index 596e222d0430..45b9cfd9c4f1 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.2.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.2.ebuild,v 1.2 2013/10/10 18:40:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.5.2-r1.ebuild,v 1.1 2013/11/22 20:59:58 pacho Exp $
 
 # TODO
 # 1. Track upstream bug --disable-docs does not work.
@@ -38,10 +38,10 @@ IUSE_CAMERAS="
 	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
+	panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax 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 tp6801
+	samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z
+	toshiba_pdrm11 topfield tp6801
 "
 
 for camera in ${IUSE_CAMERAS}; do
@@ -50,6 +50,7 @@ done
 
 # libgphoto2 actually links to libtool
 RDEPEND="
+	dev-libs/libxml2:2
 	sys-devel/libtool
 	virtual/libusb:0
 	cameras_ax203? ( media-libs/gd:= )
@@ -69,16 +70,12 @@ DEPEND="${RDEPEND}
 #		>=dev-util/gtk-doc-1.10 )"
 
 RDEPEND="${RDEPEND}
-	!<sys-fs/udev-136"
+	!<sys-fs/udev-175"
 
 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
-
-	if use cameras_template || use cameras_sipix_blink; then
-		einfo "Upstream considers sipix_blink & template driver as obsolete"
-	fi
 }
 
 pkg_setup() {
@@ -104,6 +101,9 @@ src_prepare() {
 	# Fix USE=zeroconf, bug #283332
 	epatch "${FILESDIR}/${PN}-2.4.7-respect-bonjour.patch"
 
+	# Fix libxml2 detection, bug #491782
+	epatch "${FILESDIR}"/${PN}-2.5.2-libxml2-detection{,2}.patch
+
 	eautoreconf
 }
 
@@ -130,16 +130,18 @@ src_configure() {
 
 	local myconf
 	use doc || myconf="ac_cv_path_DOXYGEN=false"
+
+	# Upstream doesn't default to --enable-option-checking due having another
+	# configure in libgphoto2_port/ that also needs to be checked on every bump
 	econf \
 		--disable-docs \
 		--disable-gp2ddb \
 		$(use_with zeroconf bonjour) \
-		--without-hal \
 		$(use_enable nls) \
 		$(use_with exif libexif auto) \
 		$(use_with gd) \
 		$(use_with jpeg) \
-		--with-drivers=${cameras} \
+		--with-camlibs=${cameras} \
 		--with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \
 		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		--with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \
@@ -194,13 +196,13 @@ src_install() {
 		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}"${cam_list} udev-rules version 175 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 175 group plugdev > ${udev_rules}"
 	fi
 
 }