USE jpeg in libgphoto2 must be enabled for indi-driver-gphoto

4 files changed, 13 insertions, 63 deletions

diff --git a/sci-libs/indilib-driver-gphoto/Manifest b/sci-libs/indilib-driver-gphoto/Manifest
index 9f53b61..d5029c3 100644
--- a/sci-libs/indilib-driver-gphoto/Manifest
+++ b/sci-libs/indilib-driver-gphoto/Manifest
@@ -1,2 +1,2 @@
-AUX fix_zlib_link.patch 766 RMD160 25739de0a0d57d7ef7b9b00de3b7bba3301c1d08 SHA1 0b619779e246d583c2aeacfac68e0a8268c77c0d SHA256 5f6a4647ea4ea1210cfc40fd225162f5583adcf95d9c98111fb975e3dbeed2c1
-EBUILD indilib-driver-gphoto-9999.ebuild 567 RMD160 33d1ce62e086667957d5965ad233bf1ad4f67037 SHA1 d7b38e36e92824f5290012f3e2270e63989d0dac SHA256 dd80ceaf0eb4677cea26f5de00d80835ebc6f58f3420acdc381b222b65453ba2
+AUX fix_zlib_link.patch 766 SHA256 5f6a4647ea4ea1210cfc40fd225162f5583adcf95d9c98111fb975e3dbeed2c1 SHA512 a33917aeff3aa82acb62f7b11c0ecc0395cb108c2b8300e22a7f8e3e4097113a0501654884dc293ddcea33df43d695646f0fbe0e4c9afe85bc6abf67e83bbf8e WHIRLPOOL 12f6c6e4b0d9f8a6698faada591ec330049889bf14ecaf66948118a919ba665cea34e5f6ab3c54baef358d86038946357a8034b1095bee3a84461583aae5cc12
+EBUILD indilib-driver-gphoto-9999.ebuild 573 SHA256 06632f2fbed5f3b0c5a72c61a223562373c5f561238a4a546df8e0211ffe2e83 SHA512 a496404c83a0f8403adeb72ecab2ee739734d9d82d27983a4bace7266e1b85182a887051a06096b92d4547a2b79131c9553f0dd86b377f59e726c23ae0f84b3d WHIRLPOOL be8b8b22eea48abc54445f4b1cfe95c9c45d5c34613d94af0e98ada8a4e6779779b5f62a96c61eff2e42b578b1b478cdc0c0c2798bdce69147fea72866d2d0d0
diff --git a/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-9999.ebuild b/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-9999.ebuild
index ae34063..b584571 100644
--- a/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-9999.ebuild
+++ b/sci-libs/indilib-driver-gphoto/indilib-driver-gphoto-9999.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
 DEPEND="sci-libs/indilib \
-	media-libs/libgphoto2"
+	media-libs/libgphoto2[jpeg]"
 
 RDEPEND="${DEPEND}"
 
diff --git a/sci-libs/indilib/Manifest b/sci-libs/indilib/Manifest
index b783c06..1e85e27 100644
--- a/sci-libs/indilib/Manifest
+++ b/sci-libs/indilib/Manifest
@@ -1,10 +1,10 @@
-AUX 0.6-fix_symlink.patch 3035 RMD160 e28792ac0c04fb993ce746fc66cd0b8cf9472073 SHA1 225e19fc422dd0ac2aff178fca6cc9ad3ba47566 SHA256 180a1fd4b0939efbedb675f90d6b9f96bcd2516c59bea0f87be79083bd83b87a
-AUX 0.6-multilib.patch 928 RMD160 bc2a8ea0b7a23ee7cae1cee1d13591398ec6d5c9 SHA1 faf3f653269458b4bb004f567c1b53d4e7d8a13e SHA256 cf56386ea42c474be1cbe6a3a9883e205001eaba34b0055e94483902a901a6be
-AUX 0.6.2-fix_fits_harddep.patch 1061 RMD160 c1560646a531cf909f61258ac77721ac46036f81 SHA1 6b39ebe56762bd4d8ffd8ecca44f67c065148a51 SHA256 f4488c695276b827e656bbe4231007b129e1d3173781666d7f7ff68a41e2a4d7
-AUX 0.6.2-fix_symlinks.patch 2298 RMD160 ec1ac1b53fe6b121f719d742191a69c4b3893303 SHA1 eaed71aaf1e255081d14b3dd2d22122fb362031d SHA256 bcd19347ceb8a085920952f28dfce724cff48e4f10af4fede8c962e812e61caa
-AUX 0.7.2-fix_linking_pthread.patch 591 RMD160 f7a6e4397627056cf4dc2badf13836d4245eedb0 SHA1 5f99949422eff8a8dac9b39377da4a5993b6ceb7 SHA256 939b8004e8d651b2ab5b42ca75390ab3d489d81bbd32c00f0e0c54babd7fcc22
-AUX 0.7.2-fix_pkgconfig.patch 470 RMD160 a0e3179d7fa2c609b1943a62290bea2516a8b53b SHA1 a3ac9c99754573c94fc732c12a937cb96579cee4 SHA256 1560353a1ab879c533c5186bd029efdb612bca7024fe280ed3d6e0e3b294ab56
-DIST libindi_0.9.1.tar.gz 602694 RMD160 977ba4f380dbbb3dc95122680e3ffd74955055fe SHA1 d4913c0fd9c622111f447d0a264ebc0127fc662c SHA256 2328661f257ee5c4cdbf384e17b64d4a4388ff4e9ed56623a9d52569c6f847d1
-EBUILD indilib-0.9.1.ebuild 1148 RMD160 0906d9ec39c8a73cdc39499f683eaf3898358183 SHA1 b1f4ef1303b60b08e6cad4cd4309ca5bd6083965 SHA256 776a47f4354f991845ace48850261c6a08cf5771f909b0de2d62d8f06f0e0197
-MISC ChangeLog 2974 RMD160 87b0701d922004f2477a536f48fd2b2ea12b8ed8 SHA1 b9a67ce2ecbf6abca1faa152a23082ec4dbeeecf SHA256 c28223cc80b24de4f1e0f7fbaefecede219e1524b8a858c49a2cd59ed9b0aa57
-MISC metadata.xml 335 RMD160 942b5fc4c73f9852492b50374514f6e10907ff02 SHA1 a2c11cd53eda2431bc7043414a6092b0a6b12c51 SHA256 34a0ab97703e3c50a0e80344d8275f27f6d138becfc3c5ada3c4daa688d8e3ef
+AUX 0.6-fix_symlink.patch 3035 SHA256 180a1fd4b0939efbedb675f90d6b9f96bcd2516c59bea0f87be79083bd83b87a SHA512 30e77b9336ae12a329cea7b07eae0e209c611ab853ccd91c1b7409a3736eb62aa97da3c3bec165141398ced33d2cac08a36751e10f844bd21e0e039cca52ac75 WHIRLPOOL 7a357dd76d1a866ab2c23226ab55217b9b7aa464ac5241010502e4e26f3476e428e7bf89e353077b201e793cac69b79a89a972c4a0717abf627fdf3f8b002a8f
+AUX 0.6-multilib.patch 928 SHA256 cf56386ea42c474be1cbe6a3a9883e205001eaba34b0055e94483902a901a6be SHA512 fd9ec22a8765f8c7da350b1ab65746e3bc009b0e3affc4f3ff6c1cffedfb04e21f1666e6b9254c519389cd1968152ac49805b7e3f2e1f7f31cf0144e7558ab85 WHIRLPOOL 314a087ce37a0e16c8c340b1dedcbc1881320a35916c2e93210b2556f0b0a2ddd15e61772d2ba6dd97364ffa57b00362a9ac96cd9be7c342307b2b4a532da4e5
+AUX 0.6.2-fix_fits_harddep.patch 1061 SHA256 f4488c695276b827e656bbe4231007b129e1d3173781666d7f7ff68a41e2a4d7 SHA512 84fb983631ea80e8f6d32405af2160af61e2f12c3ed9d606bed2e6af900853a10d94a504d5c6b38db2268811f1a137521ec51e30163adff7ce384e164296798d WHIRLPOOL 69d55519699cad80bdeb14e7a1b0f9d8228f3bee180c260d866a8e7db63d28cdd3f7d6ac7f31113bd47cc87d1a981ba8ff215699b7dbc47149ffefa039635643
+AUX 0.6.2-fix_symlinks.patch 2298 SHA256 bcd19347ceb8a085920952f28dfce724cff48e4f10af4fede8c962e812e61caa SHA512 c44a9d9d09b561ceef475fba9bd0dab850ae8ee8b5f23b98206cfe4514e51ffb5546bea230fd9c6057ea0c0adbefc9471b2f9771a78750378fe04ec7efe377ab WHIRLPOOL 5622b2a6ab8dececeafa14c918f7465e5fb9f233a7c8e60f5044ca28d111047a3cbd9b538795cda24ba0cb7f5a5e5b18b1c76a58983e3352f8cbc0a2e848fb80
+AUX 0.7.2-fix_linking_pthread.patch 591 SHA256 939b8004e8d651b2ab5b42ca75390ab3d489d81bbd32c00f0e0c54babd7fcc22 SHA512 a628696ec9c5a0439cf3796ab87865b63a1cb7d4fd6ea2bfe1e5db3db4fa529d71105373c19f6c913bf1c3717d7ce98c24b2f91bc869a8935e717e394e225688 WHIRLPOOL 82c3c2eba298fdabf8ba58979688c2df6c152891e9755ac6da472454ca62988d8c6049ebff11ff49e4d74aa8c3d76ed72c8eabcf80530e715a2f191cdea1aa37
+AUX 0.7.2-fix_pkgconfig.patch 470 SHA256 1560353a1ab879c533c5186bd029efdb612bca7024fe280ed3d6e0e3b294ab56 SHA512 6da69105e15134b5d6ecff11aec961d81e2473b70c91d8f05bef3abd22c773ee6d51b6f7a5147776cb6b0ad811059c638dd789981caab07cee3c13fa0bac0ea6 WHIRLPOOL 2fad33c6654d7401b4834799da082b23616e840229ff9cb6df30958c1fd685f25c2436134b1c740550eade942b5ef5d529c3b735d44daeec190661053ec36fd4
+DIST libindi_0.9.6.tar.gz 393523 SHA256 44ef0a943fe9f312f874b2e76b9892bd850c60cbd936f608fb2c224375d6d0b3 SHA512 6fb07652dfd64894c80cb3f91cf2e94af27b5bded5ae3d9bfeab93c501f4f9ab64e24fe377e65bba9bba92cd1858df5ec0626cc19a26d3f8d3f4cec314fb42bd WHIRLPOOL 571da798d3869a14feefde887854dc9e036a50ed1e05adf2e88c83cd340c38f84678596638d82cabb3dbbe7e6f0ddd38243f2cdde6faf5eb9fb9b57d9e979338
+EBUILD indilib-0.9.6.ebuild 1148 SHA256 776a47f4354f991845ace48850261c6a08cf5771f909b0de2d62d8f06f0e0197 SHA512 5fea1824ab8605020da9bd18b54ace8807a1c3e6bb5a0603d3dd48069f926c9ed75100afc3e5d4ac5b759babefeadd97fc544eb128319f973269916af01e0399 WHIRLPOOL 52d4b929a74b310fc1c5afa46347783cd29904a0f9ab1d7e570ec45ed9105be5c7f3d6ef79e5e942b7f5c6f3c2cc9709ee002ce2fd1ee6f9c9b3433707f3bd8a
+MISC ChangeLog 2974 SHA256 c28223cc80b24de4f1e0f7fbaefecede219e1524b8a858c49a2cd59ed9b0aa57 SHA512 33e6dc584f8ae66a2617a907674bfc8c45c1fb7486489429b05452085312920ecbe26a592794af208c0748ea5c8d0ae8dafc480918d47c01e7cc7ee39425f925 WHIRLPOOL a5ca2f339e7503f8766b826aa3bb84d8c0b1c9b3ed9b337a32ec646d931507dd6c029084360dc6cd7d0a25052926ca152c07533de8c138b2be4aba14d304409d
+MISC metadata.xml 335 SHA256 34a0ab97703e3c50a0e80344d8275f27f6d138becfc3c5ada3c4daa688d8e3ef SHA512 89ed49eca1091ba5cd4aadedea903f2dc24d50466b63e2deb96b61c869558ee1619dc24bbe2b008880c94e41a0457db5bfe95ed0d60a0f1f97da6e993f7f8db2 WHIRLPOOL 3b1a32eb17cda554dd5b377d804ee6c2fb13f5f802f5cf2a70a45bdc4cfd895b17bbc67e0e178e66182e253bb3540d3b29242a5bb1ebe56a5504269c792bbd77
diff --git a/sci-libs/indilib/indilib-0.9.1.ebuild b/sci-libs/indilib/indilib-0.9.1.ebuild
deleted file mode 100644
index fcdc9d0..0000000
--- a/sci-libs/indilib/indilib-0.9.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/indilib/indilib-0.7.2.ebuild,v 1.6 2011/10/30 15:47:38 ssuominen Exp $
-
-EAPI=3
-
-MY_P="lib${PN/lib/}_${PV}"
-
-inherit cmake-utils eutils
-
-DESCRIPTION="INDI Astronomical Control Protocol library"
-HOMEPAGE="http://indi.sourceforge.net/index.php/Main_Page"
-SRC_URI="mirror://sourceforge/${PN/lib/}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
-IUSE="fits nova usb v4l"
-
-# libfli: not in portage
-# fli? ( >=sci-libs/fli-1.71 )
-RDEPEND="
-	sys-libs/zlib
-	fits? ( >=sci-libs/cfitsio-3.140 )
-	nova? ( >=sci-libs/libnova-0.12.1 )
-	usb? ( virtual/libusb:0 )
-"
-DEPEND="${RDEPEND}
-	v4l? ( >=sys-kernel/linux-headers-2.6 )
-"
-
-S="${WORKDIR}/${MY_P/_/-}"
-
-src_prepare() {
-	base_src_prepare
-
-	# fix multilib
-	sed -i \
-		-e "s:\${LIB_POSTFIX}:\${LIB_SUFFIX}:g" \
-		CMakeLists.txt || die "sed failed"
-}
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with usb)
-		$(cmake-utils_use_with fits CFITSIO)
-		$(cmake-utils_use_with nova)
-	"
-	cmake-utils_src_configure
-}