Version bump.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 126 insertions, 21 deletions

diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index 5a278b1982fa..25e616643b44 100644
--- a/media-gfx/darktable/ChangeLog
+++ b/media-gfx/darktable/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/darktable
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.18 2012/06/08 06:32:18 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.19 2012/08/01 07:27:18 radhermit Exp $
+
+*darktable-1.0.5 (01 Aug 2012)
+
+  01 Aug 2012; Tim Harder <radhermit@gentoo.org> +darktable-1.0.5.ebuild:
+  Version bump.
 
   08 Jun 2012; Tim Harder <radhermit@gentoo.org> -darktable-0.9.3.ebuild,
   -files/darktable-0.9.3-cflags.patch:
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 63c78300aa5e..bea01151bd22 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX darktable-0.9.3-no-rawspeed.patch 2454 RMD160 9df715206f184983fe314e302299f19f6a1cfb14 SHA1 ec6738e3960c0da9eb7823673d0ae1f51019c207 SHA256 d865b01d46813a5ef3f803230a8313a94464e040c4a221f757b222cbb32bef83
-AUX darktable-0.9.3-opencl-kernels.patch 452 RMD160 e28537acbf4f3d2178401ebef45cf8c6a12c87be SHA1 001137eeee0e41c45160cd98f75695cc8eec3be5 SHA256 e7bea66a1538f2f8acc97b80aba090bbaecb78c7b1be132ee06cfcc23b71ef77
-AUX darktable-0.9.3-system-libraw.patch 3027 RMD160 85bcd48e42df239a191ed7c0075758cc18c34db2 SHA1 c7b494b3b8e0a04dab04a4fd5298502e9c780bbb SHA256 9bb49769e5fd98c6a4c48f66448383f50c8b601362a3e2974e2b8745bbd04db7
-AUX darktable-1.0-cflags.patch 1462 RMD160 0561f2dd0d1add67cbbdb2ebf4ff3eba34323763 SHA1 1c9d4b5581794923bc7cbeea151d63f2d79f1cd1 SHA256 dfec1343d549acc507677a862c0aa741efb31edfbc494998cb13a9f11a29b81d
-AUX darktable-1.0-no-gphoto2.patch 626 RMD160 ebbaed411d20bd56ca6faa72b5f119ecdd20dd23 SHA1 15f00958e8d3880d20292d4172542fe620a12bec SHA256 207d67482f718b27b128746ba4b3b47d6edf7df5edae78fcadf3b6eb642a1701
-AUX darktable-1.0.4-cflags.patch 1764 RMD160 f6d21f864e05cfa586afc170dfcd164457f1c3e5 SHA1 f49ae7ae5ea2f5a1a36dae31a8ff805f91c8b0d9 SHA256 3b4ad90e9ffd7e997196a01f40146e6c252b7efe2cf454c8c33781ab18431ad0
-DIST darktable-1.0.4.tar.gz 2547099 RMD160 1145d36f76056118cf836796b67480afd5fc8f38 SHA1 ca523b5d944abe9e724737bcbfaf6f29c49aa2c3 SHA256 eb15cbf934e7d504bfffcd841628825cc111265b8cc7c4a895ba6c585b1b108b
-DIST darktable-1.0.tar.gz 2535774 RMD160 ef787b4b3276594e6e1e51272abaa374ea494aeb SHA1 3142beea51d5d5ae6f0089a11cf1b342a48a69f7 SHA256 75e2a1905dc262d771a0064b461b4419a6dc914776ed18cc6a45b8294c175b72
-EBUILD darktable-1.0.4.ebuild 2479 RMD160 8371152d8c764ac7c8c5a8b82e5ab0023dda8375 SHA1 676b4972c6ffaec2de43455950a8a733e8525901 SHA256 9f3175afd4c37139212af49d5519baf1516bfa3b8fb13eb3827d962fd2f39fbf
-EBUILD darktable-1.0.ebuild 2511 RMD160 46601c94f127c2087c126ba3f3541166c5a3fab0 SHA1 dcd51102247ed0582606eff19d872b23630c1ed7 SHA256 a1edbb5625b8b72f48ee6545ab251ca1bafca6971fbb414fca8e544220303e2e
-MISC ChangeLog 4184 RMD160 d4256a78626ce5c0524e0df00507b02a156e6d24 SHA1 e3504061b0cef7b3ae70ea4a70e27b1ea1ab197a SHA256 1aea3ca33998411edccde9d4cd671d9f171df274fdf9dd6db21619c8cc7aa15e
-MISC metadata.xml 516 RMD160 ca94973ccca803f6f5dd1646f9c9ca3624712144 SHA1 3508593304c9b41001b6721d03f56c94a0183599 SHA256 486fbce594db4aad661bcabd94e398edcf55da660d802bebf7ea0838f7cf26e1
+AUX darktable-0.9.3-no-rawspeed.patch 2454 SHA256 d865b01d46813a5ef3f803230a8313a94464e040c4a221f757b222cbb32bef83 SHA512 9bd50b67f55f2a1aee58c3f48109f74e1f646956c589d6261c4e5ea530824fca52e81ddf2499ec83d987416c63d1cf46a7a2d0f90b4f4e2289bba7ec971c8438 WHIRLPOOL ec4ad54e9dabba9997d2d29649ecfb37d3e7a3d6231579e3eb6cb58569bc3ea99383f42ccc96c07a4b88874f91578c37f7cfcef492321b2bbf66212de2890649
+AUX darktable-0.9.3-opencl-kernels.patch 452 SHA256 e7bea66a1538f2f8acc97b80aba090bbaecb78c7b1be132ee06cfcc23b71ef77 SHA512 8233f972998c5f6c0a59400ac8e7e06b83673a70bc8eae1d226cfdb0861f24cd7086b439949a2ab40c1c2372724aeecd56267b38148cb764708448a1c3c9353f WHIRLPOOL 722caca64b333247f074972d41cc43b48f697dbf7dc72fca6f9a4ab650730d2e44d922bd4658def91cee6c43418317c89ae4ae60d6994aec1deb4973cb9b8c41
+AUX darktable-0.9.3-system-libraw.patch 3027 SHA256 9bb49769e5fd98c6a4c48f66448383f50c8b601362a3e2974e2b8745bbd04db7 SHA512 84d9367d3bf5182c87d99e9c863bfa914c4a7c0432981d8eca2f68df814c8ca65f0d82b92a70cddaf3078986c371eb8943b35fd8a4606875379d90ce6fa73c86 WHIRLPOOL 8a61547b2f972b318350cc9e553acb933cf898137798fbf70f0365056677a90b6c211c65b2a54e3bdb89510fa73852114c7e9d4530440e5121cedc076229c9d6
+AUX darktable-1.0-cflags.patch 1462 SHA256 dfec1343d549acc507677a862c0aa741efb31edfbc494998cb13a9f11a29b81d SHA512 13ae9ce98613991d7cd993b795f9c7727c4776e74a7d2ea0973100b3c116fb43e3b1bf517d5137cd747d0a31fccd4c4c5f71ed3fd4c114cd243d54ae6c5595bc WHIRLPOOL 86bf11d7911ee4afea6e0bf00804b49093401d6042705a35fca0066d70e4e19f042b07ea238d4c5fdcf2e92b337cd3e8bee170c526cfad5d2584a8f03a232590
+AUX darktable-1.0-no-gphoto2.patch 626 SHA256 207d67482f718b27b128746ba4b3b47d6edf7df5edae78fcadf3b6eb642a1701 SHA512 8813456a020b42a2699af40f9ae4b491a0c2cb12e6de1a78e495ef26213edc382418278626fbf107594bcf65a21ffc54d649a32aa8d2044c4ffb670262e6c927 WHIRLPOOL 941faab4de6357948f76fbc4da06a751697ad75bce11c451afb2017ab3a694440c061e71988044b13bd61928497ed57c39d4872d450c6c6e999f2bef34b83a0f
+AUX darktable-1.0.4-cflags.patch 1764 SHA256 3b4ad90e9ffd7e997196a01f40146e6c252b7efe2cf454c8c33781ab18431ad0 SHA512 d8d851c113e82d5667f2b77348dfa9cf1ff7f8d5314d0e7dbf8daba477f8b895d3628d569d4a1608d1c1acf4447b18d9933bd538f1ce94794772b34b1eaf4239 WHIRLPOOL 820bf01ee365f527ba7ca4402b56e72a1c918eee178b2a460fa8b2d850a0e0fb75b99e0d736d948606f7e58eeb8c247e1f962e148188699babb94cb59e69d6d6
+DIST darktable-1.0.4.tar.gz 2547099 SHA256 eb15cbf934e7d504bfffcd841628825cc111265b8cc7c4a895ba6c585b1b108b SHA512 cc79695735d3de7494d835707cf043ae8b4252d6cf278539214b2e7ca833fa9262c70e98712812ba7104cbfe261a979d8b65215c61c242c48086477288c1d5b5 WHIRLPOOL 966e777434384e8b80acac28e841204340ef13c40834661b1e317df7447fd1dfd6ada0b147dd2b2ee4ade32352ffdda7fa37d4ede7a5f8687a27f60d2c43fb9d
+DIST darktable-1.0.5.tar.gz 2568221 SHA256 0c18530446d2f2459fe533a1ef6fc2711300efe7466f36c23168ec2230fb5fbd SHA512 52b532a07a029355a3e689971f15bf5c1a28a587419b5fae40aa342f724d3c15b4ceb557354ad46d4ca7f6e951e9b8de5ac15ccf0c4fa41a85249d5a41972cfb WHIRLPOOL 8e189a8c1bae068a170c2c0a38fba63bbeba006a004109fc0c7e8f985f5149c09b864a569580d295dc3c03694d395b8fe87fc86eb996c0697e9677cf69478e8e
+DIST darktable-1.0.tar.gz 2535774 SHA256 75e2a1905dc262d771a0064b461b4419a6dc914776ed18cc6a45b8294c175b72
+EBUILD darktable-1.0.4.ebuild 2479 SHA256 9f3175afd4c37139212af49d5519baf1516bfa3b8fb13eb3827d962fd2f39fbf SHA512 187473705d9247a37feb1953e79fbcbee584a9d4449dbbb6ac807a18ef4b29f7cb3303e6d7eb067ec49c3fd1ac69f0ccb6f97456a87f47efd0d3346d117b8cc0 WHIRLPOOL cfecc05d7472ef05655774e9e5bdaead816d460e6886e8ed9b06ea49215b709432113146111cb4ec0e1e007737d3bc055fa0cc81d690eb97f6c819a922b7f64f
+EBUILD darktable-1.0.5.ebuild 2486 SHA256 a104cc4904d707deb0f64913d084232fcabba621fc0f905d029258f3a54fdca4 SHA512 921a1ed562b7823c0448e4efd2b0caf53327bb8f7288279888dcd6dd3e6d7cfea2e01b82f594a58f836fdaf0c3f45d55cf7a9d281970224079046c5b66c2c01f WHIRLPOOL 19428716912b53d7499575fae8114dd35cff80953ce96ce4c8cbc0ac76600fcb906ff797758e14ff4479f9dc438807db320a1e853c45ec72030607c7346480a5
+EBUILD darktable-1.0.ebuild 2511 SHA256 a1edbb5625b8b72f48ee6545ab251ca1bafca6971fbb414fca8e544220303e2e SHA512 5f6b42b7b16c759106da5b7d475e8a9ccc38d9b32485da6cee64d7df91a7cbbd86daaf26ea9191052069400c73b0374c6499d52c300bc41f7003ea9acc5a2d60 WHIRLPOOL a18856e6e4ff8903572e0aee973dc54fe86abfdce723606898f616878c2add0803ed853377580e5ce688959af4065d0d76c2afb90a8030ceabceab8b0d7413c0
+MISC ChangeLog 4307 SHA256 e51c47805e78ac95fa97e53af9ffe7c461574e3c63968f6c839070bb48f2098f SHA512 feae1b59dda6ac3664ad8bfbed86ea8dba941ba744b0936d03673b673b402fb9a754c354ae229eff6ff40a3b33056f01a0617c35571f65777a1b70ff5ee04042 WHIRLPOOL 2a3985bc8867a6e115cd80acddedb23a7100077a1ab353c1eb4858a84c7f50045530ccff5b9a5f690e6f9e9a8be4cf8ab48773b24c2ac6620570460ca7e11cc5
+MISC metadata.xml 516 SHA256 486fbce594db4aad661bcabd94e398edcf55da660d802bebf7ea0838f7cf26e1 SHA512 4206b7f70874e460faa75356ad75a3518b163bb907c3ee3fa91fc4460ab016b945476ad139a637075a0d9119ddb9c7e94aa722c872d8332c2a7c0614940baacd WHIRLPOOL 46f767a6fd76451a84afb9648b0f8bb0573bda524be9a68e9e962f54fea44acbdccc7567e0bdcfc095daad1b5c87c0e59c0832d69c93c456c0b5c0becc742cac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP0Zx4AAoJEEqz6FtPBkyjoAUH/i+/1rsqlPreOn/S4cIhwsbN
-9WcgL3TVfLtUXYNlvjdha7vBHCAxnlNrew+TIQawm3IB/uft6ApjZqWy1pCUCImd
-sqEZwHb1QOKSnngkzsCLvTGZbRgzvW9/Gqa1RsSF3HlO9Kn9pYmR6Ni1LBTfMPcF
-2x0guYLDoRlyJyIfsFtwCLvR6kfjurpCKV/aNvewjJW0X7N6GUgC2BmPdOLbItFW
-mznzmzGGMFMMsAzTMi8G644AdMU0B/f96CGBf+zpblpPMls7lW2W4m+ai2zj+kGl
-90bL7xLQCwjIWHsVvVEHYgpyUPgFFQpODv7QbdcjZqt+3AVd7ehEr/qq58vKC9M=
-=hXAP
+iQEcBAEBCAAGBQJQGNpcAAoJEEqz6FtPBkyjgloH/37cUAqc2wAnHkoD7b/3poG3
+GANkbFb7MCf7B2uAauM5ap14d1sWo6YwqLYe7AiDiWtnpEekw3W7rxNttr4PfYrq
+dmRyEtcAsNzXTkeJC2UAjhVnzSM2A5VzKMR9qMoq9E+WdtPMFDyZY799hfmJXn9Q
+08BfBL0njgUInJ9W57BhuidPwcYOveHtk4le4PgtKwesLf9Mgxs8LMV10asH6wwR
+9G1p+WcBiShA359dCDCqbhu+2srirDbmrPUk0yiLD8G9voIcgrWMRKxSWl+yHSP0
+TBjRiSEQPm7S1eZm3R2WJ7jpIpS/LsJuZuFwTkL9+Ta6YPNbo2rBotObaSH6b5w=
+=DaFJ
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/darktable/darktable-1.0.5.ebuild b/media-gfx/darktable/darktable-1.0.5.ebuild
new file mode 100644
index 000000000000..bc675ded2cb1
--- /dev/null
+++ b/media-gfx/darktable/darktable-1.0.5.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-1.0.5.ebuild,v 1.1 2012/08/01 07:27:18 radhermit Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+
+inherit gnome2 eutils cmake-utils toolchain-funcs
+
+DESCRIPTION="A virtual lighttable and darkroom for photographers"
+HOMEPAGE="http://darktable.sf.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug flickr gnome gphoto2 kde nls opencl openmp +rawspeed +slideshow video_cards_nvidia"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/libxml2:2
+	flickr? ( media-libs/flickcurl )
+	gnome? (
+		gnome-base/gconf
+		gnome-base/gnome-keyring
+	)
+	gnome-base/librsvg:2
+	gphoto2? ( media-libs/libgphoto2 )
+	kde? ( dev-libs/dbus-glib )
+	media-gfx/exiv2[xmp]
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3
+	media-libs/libpng
+	>=media-libs/libraw-0.13.4[demosaic]
+	media-libs/openexr
+	media-libs/tiff
+	net-misc/curl
+	opencl? ( virtual/opencl )
+	slideshow? (
+		media-libs/libsdl
+		virtual/opengl
+	)
+	virtual/jpeg
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.3-system-libraw.patch
+	"${FILESDIR}"/${PN}-0.9.3-no-rawspeed.patch
+	"${FILESDIR}"/${PN}-0.9.3-opencl-kernels.patch
+	"${FILESDIR}"/${PN}-1.0.4-cflags.patch
+)
+
+pkg_setup() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+}
+
+src_prepare() {
+	base_src_prepare
+	sed -i -e "s:\(/share/doc/\)darktable:\1${PF}:" \
+		-e "s:LICENSE::" doc/CMakeLists.txt || die
+}
+
+src_configure() {
+	local myconf
+	myconf="-DDONT_INSTALL_GCONF_SCHEMAS=$(usex gnome OFF ON)"
+	myconf+=" -DUSE_OPENCL=$(usex opencl ON OFF)"
+
+	use debug && CMAKE_BUILD_TYPE=Debug
+
+	mycmakeargs=(
+		$(cmake-utils_use_use flickr FLICKR)
+		$(cmake-utils_use_use gnome GCONF_BACKEND)
+		$(cmake-utils_use_use gnome GNOME_KEYRING)
+		$(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)
+		$(cmake-utils_use_use kde KWALLET)
+		$(cmake-utils_use_use nls NLS)
+		$(cmake-utils_use_use openmp OPENMP)
+		$(cmake-utils_use !rawspeed DONT_USE_RAWSPEED)
+		$(cmake-utils_use_build slideshow SLIDESHOW)
+		${myconf}
+		-DINSTALL_IOP_EXPERIMENTAL=ON
+		-DINSTALL_IOP_LEGACY=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
+	cmake-utils_src_install
+	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+}