Remove old.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

7 files changed, 8 insertions, 383 deletions

diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index 6d678507fb85..06b8be274a98 100644
--- a/media-gfx/darktable/ChangeLog
+++ b/media-gfx/darktable/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/darktable
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.13 2011/12/20 22:04:32 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.14 2012/02/13 09:57:26 radhermit Exp $
+
+  13 Feb 2012; Tim Harder <radhermit@gentoo.org>
+  -files/darktable-0.9.1-no-rawspeed.patch, -darktable-0.9.2-r1.ebuild,
+  -darktable-0.9.2-r2.ebuild, -files/darktable-0.9.2-system-libraw.patch,
+  -files/darktable-0.9.2-zlib-header.patch, -files/darktable-0.9-cflags.patch:
+  Remove old.
 
   20 Dec 2011; Mike Frysinger <vapier@gentoo.org> darktable-0.9.3.ebuild:
   Switch to new virtual/opencl #392179 by Michal Pytasz.
diff --git a/media-gfx/darktable/darktable-0.9.2-r1.ebuild b/media-gfx/darktable/darktable-0.9.2-r1.ebuild
deleted file mode 100644
index 4702e39011f5..000000000000
--- a/media-gfx/darktable/darktable-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-0.9.2-r1.ebuild,v 1.1 2011/08/26 21:35:59 radhermit Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit gnome2 cmake-utils
-
-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"
-IUSE="debug flickr gnome gphoto2 kde nls openmp +rawspeed +slideshow"
-KEYWORDS="~amd64 ~x86"
-
-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
-	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
-	slideshow? (
-		media-libs/libsdl
-		virtual/opengl
-	)
-	virtual/jpeg
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )
-	openmp? ( >=sys-devel/gcc-4.4[openmp] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-system-libraw.patch
-	"${FILESDIR}"/${PN}-0.9.1-no-rawspeed.patch
-	"${FILESDIR}"/${PN}-0.9-cflags.patch
-)
-
-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
-	if use gnome ; then
-		myconf="-DDONT_INSTALL_GCONF_SCHEMAS=OFF"
-	else
-		myconf="-DDONT_INSTALL_GCONF_SCHEMAS=ON"
-	fi
-
-	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
-}
diff --git a/media-gfx/darktable/darktable-0.9.2-r2.ebuild b/media-gfx/darktable/darktable-0.9.2-r2.ebuild
deleted file mode 100644
index cbf7b02a7a36..000000000000
--- a/media-gfx/darktable/darktable-0.9.2-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/darktable-0.9.2-r2.ebuild,v 1.2 2011/09/21 18:39:29 radhermit Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit gnome2 cmake-utils
-
-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"
-IUSE="debug flickr gnome gphoto2 kde nls openmp +rawspeed +slideshow"
-KEYWORDS="~amd64 ~x86"
-
-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
-	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
-	slideshow? (
-		media-libs/libsdl
-		virtual/opengl
-	)
-	virtual/jpeg
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )
-	openmp? ( >=sys-devel/gcc-4.4[openmp] )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-system-libraw.patch
-	"${FILESDIR}"/${PN}-0.9.1-no-rawspeed.patch
-	"${FILESDIR}"/${PN}-0.9-cflags.patch
-	"${FILESDIR}"/${P}-zlib-header.patch
-)
-
-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
-	if use gnome ; then
-		myconf="-DDONT_INSTALL_GCONF_SCHEMAS=OFF"
-	else
-		myconf="-DDONT_INSTALL_GCONF_SCHEMAS=ON"
-	fi
-
-	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}
-		-DUSE_OPENCL=OFF
-		-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
-}
diff --git a/media-gfx/darktable/files/darktable-0.9-cflags.patch b/media-gfx/darktable/files/darktable-0.9-cflags.patch
deleted file mode 100644
index 21c2d9c5f936..000000000000
--- a/media-gfx/darktable/files/darktable-0.9-cflags.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- darktable-0.9/src/CMakeLists.txt.orig
-+++ darktable-0.9/src/CMakeLists.txt
-@@ -217,27 +217,27 @@
- # c++ code doesn't like -Werror (libraw)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing")
- 
--if(NOT APPLE)
--  # apple build fails on deprecated warnings..
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
--endif(NOT APPLE)
-+#if(NOT APPLE)
-+#  # apple build fails on deprecated warnings..
-+#  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
-+#endif(NOT APPLE)
- 
- if(NOT WIN32)
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread")
- endif(NOT WIN32)
- 
--if(NOT BINARY_PACKAGE_BUILD)
--	set(MARCH "-march=native")	
--else()
--	set(MARCH "-mtune=generic")
--endif()
-+#if(NOT BINARY_PACKAGE_BUILD)
-+#    set(MARCH "-march=native")	
-+#else()
-+#    set(MARCH "-mtune=generic")
-+#endif()
- 
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse ${MARCH} -g")
--set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations")
--set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g -D_DEBUG")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse ${MARCH} -g")
--set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations")
--set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g -D_DEBUG")
-+#set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse ${MARCH} -g")
-+#set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations")
-+set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
-+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse ${MARCH} -g")
-+#set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -fexpensive-optimizations")
-+set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
-   
- 
- #
diff --git a/media-gfx/darktable/files/darktable-0.9.1-no-rawspeed.patch b/media-gfx/darktable/files/darktable-0.9.1-no-rawspeed.patch
deleted file mode 100644
index db699b89f578..000000000000
--- a/media-gfx/darktable/files/darktable-0.9.1-no-rawspeed.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- darktable-0.9.1.orig/src/CMakeLists.txt
-+++ darktable-0.9.1/src/CMakeLists.txt
-@@ -274,19 +274,19 @@
- )
- SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c PROPERTIES GENERATED 1)
- SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h PROPERTIES GENERATED 1)
--# this is a dummy library whose sole purpose is to serve as a dependency for subdirs, such as imageio/storage/gallery.
--# cmake can't depend on custom targets in other directories than the current one.
--add_library(metadata_dummy ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h)
-+add_custom_target(metadata_gen DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h)
- 
- #
- # build libdarktable
- #
--add_library(lib_darktable STATIC SHARED ${CMAKE_CURRENT_BINARY_DIR}/preferences_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c ${CMAKE_CURRENT_BINARY_DIR}/accelstrings_gen.h ${SOURCES})
-+add_library(lib_darktable SHARED ${CMAKE_CURRENT_BINARY_DIR}/preferences_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.h ${CMAKE_CURRENT_BINARY_DIR}/metadata_gen.c ${CMAKE_CURRENT_BINARY_DIR}/accelstrings_gen.h ${SOURCES})
-+add_dependencies(lib_darktable metadata_gen)
- if(APPLE)
-   set_target_properties(lib_darktable PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib/darktable")
- endif(APPLE)
- set_target_properties(lib_darktable PROPERTIES OUTPUT_NAME darktable)
- set_target_properties(lib_darktable PROPERTIES LINKER_LANGUAGE C)
-+target_link_libraries(lib_darktable ${LIBS})
- 
- 
- #
-@@ -306,7 +306,7 @@
-   add_dependencies(lib_darktable rawspeed)
-   add_library(rawspeed_static STATIC IMPORTED)
-   set_target_properties(rawspeed_static PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/rawspeed/librawspeed.a)
--  target_link_libraries(lib_darktable ${LIBS} rawspeed_static)
-+  target_link_libraries(lib_darktable rawspeed_static)
-   # compile rawspeed
-   add_subdirectory(external/rawspeed)
- endif(NOT DONT_USE_RAWSPEED)
---- darktable-0.9.1.orig/src/imageio/storage/CMakeLists.txt
-+++ darktable-0.9.1/src/imageio/storage/CMakeLists.txt
-@@ -10,7 +10,7 @@
- foreach(module ${MODULES} ${MODULES_EXPERIMENTAL})
- 	add_library(${module} MODULE "${module}.c")
- endforeach(module)
--add_dependencies(gallery metadata_dummy)
-+add_dependencies(gallery metadata_gen)
- 
- foreach(module ${MODULES})
- 	target_link_libraries(${module} ${LIBS})
diff --git a/media-gfx/darktable/files/darktable-0.9.2-system-libraw.patch b/media-gfx/darktable/files/darktable-0.9.2-system-libraw.patch
deleted file mode 100644
index 89ddc001510a..000000000000
--- a/media-gfx/darktable/files/darktable-0.9.2-system-libraw.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- darktable-0.9.2.orig/cmake/modules/FindLibraw.cmake
-+++ darktable-0.9.2/cmake/modules/FindLibraw.cmake
-@@ -0,0 +1,29 @@
-+# - Try to find libraw
-+# Once done, this will define
-+#
-+#  Libraw_FOUND - system has Libraw
-+#  Libraw_INCLUDE_DIRS - the Libraw include directories
-+#  Libraw_LIBRARIES - link these to use Libraw
-+
-+include(LibFindMacros)
-+
-+# Use pkg-config to get hints about paths
-+libfind_pkg_check_modules(Libraw_PKGCONF libraw)
-+
-+# Include dir
-+find_path(Libraw_INCLUDE_DIR
-+  NAMES libraw.h
-+  PATHS ${Libraw_PKGCONF_INCLUDE_DIRS}
-+)
-+
-+# Finally the library itself
-+find_library(Libraw_LIBRARY
-+  NAMES raw_r
-+  PATHS ${Libraw_PKGCONF_LIBRARY_DIRS}
-+)
-+
-+# Set the include dir variables and the libraries and let libfind_process do the rest.
-+# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-+set(Libraw_PROCESS_INCLUDES Libraw_INCLUDE_DIR Libraw_INCLUDE_DIRS)
-+set(Libraw_PROCESS_LIBS Libraw_LIBRARY Libraw_LIBRARIES)
-+libfind_process(Libraw)
---- darktable-0.9.2.orig/src/CMakeLists.txt
-+++ darktable-0.9.2/src/CMakeLists.txt
-@@ -77,7 +77,6 @@
- 
- include_directories(${CMAKE_CURRENT_SOURCE_DIR})
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external)
--include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/LibRaw)
- 
- # initial compiler flags
- add_definitions("-DHAVE_CONFIG_H")
-@@ -129,7 +128,7 @@
- endif(USE_CAMERA_SUPPORT)
- 
- # Find all the libs that don't require extra parameters
--foreach(lib ${OUR_LIBS} LensFun GIO GThread GModule Cairo PangoCairo PThread Rsvg2 GDK-PixBuf LibXml2 INotify Sqlite3 Exiv2  CURL PNG JPEG TIFF OpenEXR LCMS2)
-+foreach(lib ${OUR_LIBS} LensFun Libraw GIO GThread GModule Cairo PangoCairo PThread Rsvg2 GDK-PixBuf LibXml2 INotify Sqlite3 Exiv2  CURL PNG JPEG TIFF OpenEXR LCMS2)
-   find_package(${lib} REQUIRED)
-   include_directories(${${lib}_INCLUDE_DIRS})
-   list(APPEND LIBS ${${lib}_LIBRARIES})
-@@ -311,17 +310,6 @@
- set_target_properties(lib_darktable PROPERTIES LINKER_LANGUAGE C)
- 
- 
--#
--# the libraw part is a bit of a hack:
--# the static linking didn't work since it was pulling -lstdc++ and -lm into linker flags.
--# so we do a custom dependency and pretend an imported liblibraw_r.a so no other -l are
--# appended.
--#
--add_dependencies(lib_darktable libraw_r)
--add_library(libraw_static STATIC IMPORTED)
--set_target_properties(libraw_static PROPERTIES IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/external/LibRaw/liblibraw_r.a)
--target_link_libraries(lib_darktable ${LIBS} libraw_static)
--
- # same for librawspeed (can switch it off with -DDONT_USE_RAWSPEED, for macs):
- if(NOT DONT_USE_RAWSPEED)
-   add_definitions("-DHAVE_RAWSPEED")
-@@ -336,9 +324,6 @@
- install(TARGETS lib_darktable DESTINATION ${LIB_INSTALL}/darktable)
- list(APPEND LIBS lib_darktable)
- 
--# Compile libraw modules
--add_subdirectory(external/LibRaw)
--
- # Compile views modules
- add_subdirectory(views)
- 
---- darktable-0.9.2.orig/src/common/imageio.c
-+++ darktable-0.9.2/src/common/imageio.c
-@@ -547,7 +547,7 @@
-   raw->params.threshold = 0;
-   raw->params.auto_bright_thr = img->raw_auto_bright_threshold;
- 
--  raw->params.amaze_ca_refine = 0;
-+  // raw->params.amaze_ca_refine = 0;
-   raw->params.fbdd_noiserd    = 0;
- 
-   ret = libraw_open_file(raw, filename);
diff --git a/media-gfx/darktable/files/darktable-0.9.2-zlib-header.patch b/media-gfx/darktable/files/darktable-0.9.2-zlib-header.patch
deleted file mode 100644
index 3f73e7989a99..000000000000
--- a/media-gfx/darktable/files/darktable-0.9.2-zlib-header.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- darktable-0.9.2/src/imageio/format/png.c.orig
-+++ darktable-0.9.2/src/imageio/format/png.c
-@@ -28,6 +28,7 @@
- #include <stdio.h>
- #include <png.h>
- #include <inttypes.h>
-+#include <zlib.h>
- 
- DT_MODULE(1)
-