Remove old.

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

7 files changed, 7 insertions, 448 deletions

diff --git a/media-gfx/darktable/ChangeLog b/media-gfx/darktable/ChangeLog
index decb954842ce..dd54baa0f677 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.7 2011/08/26 21:35:59 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/darktable/ChangeLog,v 1.8 2011/08/29 03:50:48 radhermit Exp $
+
+  29 Aug 2011; Tim Harder <radhermit@gentoo.org> -darktable-0.9.1-r1.ebuild,
+  -files/darktable-0.9.1-system-libraw.patch, -darktable-0.9.2.ebuild,
+  -files/darktable-0.9-automagic-deps.patch, -darktable-9999.ebuild,
+  metadata.xml:
+  Remove old.
 
 *darktable-0.9.2-r1 (26 Aug 2011)
 
diff --git a/media-gfx/darktable/darktable-0.9.1-r1.ebuild b/media-gfx/darktable/darktable-0.9.1-r1.ebuild
deleted file mode 100644
index 6941148372d4..000000000000
--- a/media-gfx/darktable/darktable-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,93 +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.1-r1.ebuild,v 1.1 2011/08/14 23:38:26 radhermit Exp $
-
-EAPI="4"
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://darktable.git.sf.net/gitroot/darktable/darktable"
-	EGIT_BRANCH="master"
-	EGIT_COMMIT="master"
-	SCM="git-2"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-GCONF_DEBUG="no"
-inherit cmake-utils ${SCM}
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="http://darktable.sf.net/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug flickr gconf gnome-keyring gphoto2 kde nls openmp +rawspeed +slideshow"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/libxml2:2
-	flickr? ( media-libs/flickcurl )
-	gconf? ( gnome-base/gconf )
-	gnome-base/libglade:2.0
-	gnome-base/librsvg:2
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	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}"/${PN}-0.9-automagic-deps.patch
-	"${FILESDIR}"/${P}-system-libraw.patch
-	"${FILESDIR}"/${P}-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() {
-	use debug && CMAKE_BUILD_TYPE=Debug
-
-	mycmakeargs=(
-		$(cmake-utils_use_use flickr FLICKR)
-		$(cmake-utils_use_use gconf GCONF_BACKEND)
-		$(cmake-utils_use_use gnome-keyring 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)
-		-DDONT_INSTALL_GCONF_SCHEMAS=ON
-		-DINSTALL_IOP_EXPERIMENTAL=ON
-		-DINSTALL_IOP_LEGACY=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install(){
-	cmake-utils_src_install
-	newicon data/pixmaps/48x48/darktable.png darktable.png
-}
diff --git a/media-gfx/darktable/darktable-0.9.2.ebuild b/media-gfx/darktable/darktable-0.9.2.ebuild
deleted file mode 100644
index 481f50aabd20..000000000000
--- a/media-gfx/darktable/darktable-0.9.2.ebuild
+++ /dev/null
@@ -1,87 +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.ebuild,v 1.1 2011/08/26 10:11:00 radhermit Exp $
-
-EAPI="4"
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://darktable.git.sf.net/gitroot/darktable/darktable"
-	EGIT_BRANCH="master"
-	EGIT_COMMIT="master"
-	SCM="git-2"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-GCONF_DEBUG="no"
-inherit cmake-utils ${SCM}
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="http://darktable.sf.net/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug flickr gconf gnome-keyring gphoto2 kde nls openmp +rawspeed +slideshow"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/libxml2:2
-	flickr? ( media-libs/flickcurl )
-	gconf? ( gnome-base/gconf )
-	gnome-base/libglade:2.0
-	gnome-base/librsvg:2
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	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() {
-	use debug && CMAKE_BUILD_TYPE=Debug
-
-	mycmakeargs=(
-		$(cmake-utils_use_use flickr FLICKR)
-		$(cmake-utils_use_use gconf GCONF_BACKEND)
-		$(cmake-utils_use_use gnome-keyring 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)
-		-DDONT_INSTALL_GCONF_SCHEMAS=ON
-		-DINSTALL_IOP_EXPERIMENTAL=ON
-		-DINSTALL_IOP_LEGACY=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
deleted file mode 100644
index e210a3d24473..000000000000
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ /dev/null
@@ -1,63 +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-9999.ebuild,v 1.1 2011/07/19 19:11:57 c1pher Exp $
-
-EAPI="4"
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://darktable.git.sf.net/gitroot/darktable/darktable"
-	EGIT_BRANCH="master"
-	EGIT_COMMIT="master"
-	SCM="git-2"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://sourceforge/project/darktable/darktable/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-GCONF_DEBUG="no"
-inherit cmake-utils ${SCM}
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="http://darktable.sf.net/"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="gconf gphoto2 openmp gnome-keyring"
-RDEPEND="
-	gconf? ( gnome-base/gconf )
-	gphoto2? ( media-libs/libgphoto2 )
-	dev-db/sqlite:3
-	dev-libs/libxml2:2
-	gnome-base/libglade:2.0
-	gnome-keyring? ( gnome-base/gnome-keyring )
-	media-gfx/exiv2
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3
-	media-libs/libpng
-	gnome-base/librsvg:2
-	media-libs/openexr
-	media-libs/tiff
-	net-misc/curl
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	virtual/jpeg"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	openmp? ( >=sys-devel/gcc-4.4[openmp] )"
-
-src_configure() {
-	mycmakeargs=(
-		"$(cmake-utils_use_use openmp OPENMP)"
-		"$(cmake-utils_use_use gconf GCONF_BACKEND)"
-		"$(cmake-utils_use_use gphoto2 CAMERA_SUPPORT)"
-		"-DDONT_INSTALL_GCONF_SCHEMAS=ON"
-		"-DINSTALL_IOP_EXPERIMENTAL=ON"
-		"-DINSTALL_IOP_LEGACY=ON" )
-	cmake-utils_src_configure
-}
-
-src_install(){
-	cmake-utils_src_install
-	newicon data/pixmaps/48x48/darktable.png darktable.png
-}
diff --git a/media-gfx/darktable/files/darktable-0.9-automagic-deps.patch b/media-gfx/darktable/files/darktable-0.9-automagic-deps.patch
deleted file mode 100644
index 28d0c236457a..000000000000
--- a/media-gfx/darktable/files/darktable-0.9-automagic-deps.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- darktable-0.9.orig/CMakeLists.txt
-+++ darktable-0.9/CMakeLists.txt
-@@ -4,6 +4,11 @@
- 
- option(USE_GCONF_BACKEND "Detect and use gconf backend if available." ON)
- option(USE_CAMERA_SUPPORT "Detect and use camera support if available." ON)
-+option(USE_NLS "Build Native Language Support (using gettext)" ON)
-+option(USE_FLICKR "Enable Flickr support" ON)
-+option(USE_KWALLET "Build kwallet password storage backend" ON)
-+option(USE_GNOME_KEYRING "Build gnome-keyring password storage backend" ON)
-+option(BUILD_SLIDESHOW "Build the opengl slideshow viewer" ON)
- option(USE_OPENMP "Use openmp threading support." ON)
- option(USE_OPENCL "Use OpenCL support." ON)
- option(USE_DARKTABLE_PROFILING OFF)
---- darktable-0.9.orig/src/CMakeLists.txt
-+++ darktable-0.9/src/CMakeLists.txt
-@@ -124,51 +124,61 @@
-   add_definitions(${${lib}_DEFINITIONS})
- endforeach(lib)
- 
--find_package(Gettext)
--if(Gettext_FOUND)
--  include_directories(${Gettext_INCLUDE_DIRS})
--  list(APPEND LIBS ${Gettext_LIBRARIES})
--  add_definitions("-DUSE_GETTEXT")
--  message(STATUS "Internationalization: Enabled")
--else()
--  message(STATUS "Internationalization: Disabled (libintl not found)")
--endif()
--
--find_package(FLICKCURL)
--if(FLICKCURL_FOUND)
--  include_directories(${FLICKCURL_INCLUDE_DIRS})
--  list(APPEND LIBS ${FLICKCURL_LIBRARIES})
--  add_definitions(${FLICKCURL_DEFINITIONS})
--endif(FLICKCURL_FOUND)
-+if(USE_NLS)
-+  find_package(Gettext)
-+  if(Gettext_FOUND)
-+    include_directories(${Gettext_INCLUDE_DIRS})
-+    list(APPEND LIBS ${Gettext_LIBRARIES})
-+    add_definitions("-DUSE_GETTEXT")
-+    message(STATUS "Internationalization: Enabled")
-+  else()
-+    message(STATUS "Internationalization: Disabled (libintl not found)")
-+  endif()
-+endif(USE_NLS)
-+
-+if(USE_FLICKR)
-+  find_package(FLICKCURL)
-+  if(FLICKCURL_FOUND)
-+    include_directories(${FLICKCURL_INCLUDE_DIRS})
-+    list(APPEND LIBS ${FLICKCURL_LIBRARIES})
-+    add_definitions(${FLICKCURL_DEFINITIONS})
-+  endif(FLICKCURL_FOUND)
-+endif(USE_FLICKR)
- 
- #
- # Detect compile of optional pwstorage backends
- #
-+if(USE_KWALLET) 
- find_package(DBUSGLIB)
--if(DBUSGLIB_FOUND)
--  list(APPEND SOURCES "common/pwstorage/backend_kwallet.c")
--  include_directories(${DBUSGLIB_INCLUDE_DIRS})
--  list(APPEND LIBS ${DBUSGLIB_LIBRARIES})
--  add_definitions("-DHAVE_KWALLET")
--endif(DBUSGLIB_FOUND)
--
--find_package(GnomeKeyring)
--if(GNOMEKEYRING_FOUND)
--  set(SOURCES ${SOURCES} "common/pwstorage/backend_gkeyring.c")
--  include_directories(${GnomeKeyring_INCLUDE_DIRS})
--  list(APPEND LIBS ${GnomeKeyring_LIBRARIES})
--  add_definitions("-DHAVE_GKEYRING")
--endif(GNOMEKEYRING_FOUND)
-+  if(DBUSGLIB_FOUND)
-+    list(APPEND SOURCES "common/pwstorage/backend_kwallet.c")
-+    include_directories(${DBUSGLIB_INCLUDE_DIRS})
-+    list(APPEND LIBS ${DBUSGLIB_LIBRARIES})
-+    add_definitions("-DHAVE_KWALLET")
-+  endif(DBUSGLIB_FOUND)
-+endif(USE_KWALLET)
-+
-+if(USE_GNOME_KEYRING)
-+  find_package(GnomeKeyring)
-+  if(GNOMEKEYRING_FOUND)
-+    set(SOURCES ${SOURCES} "common/pwstorage/backend_gkeyring.c")
-+    include_directories(${GnomeKeyring_INCLUDE_DIRS})
-+    list(APPEND LIBS ${GnomeKeyring_LIBRARIES})
-+    add_definitions("-DHAVE_GKEYRING")
-+  endif(GNOMEKEYRING_FOUND)
-+endif(USE_GNOME_KEYRING)
- 
- # have a small test program, to be run as root on some systems to enable the driver to run cl stuff
- add_subdirectory(cltest)
- 
- # build opengl slideshow viewer?
--find_package(SDL)
--find_package(OpenGL)
--if(SDL_FOUND AND OPENGL_FOUND)
--  add_subdirectory(dtview)
--endif(SDL_FOUND AND OPENGL_FOUND)
-+if(BUILD_SLIDESHOW) 
-+  find_package(SDL)
-+  find_package(OpenGL)
-+  if(SDL_FOUND AND OPENGL_FOUND)
-+    add_subdirectory(dtview)
-+  endif(SDL_FOUND AND OPENGL_FOUND)
-+endif(BUILD_SLIDESHOW)
- 
- # needed for the file manager
- if(APRIL_FOOLS)
diff --git a/media-gfx/darktable/files/darktable-0.9.1-system-libraw.patch b/media-gfx/darktable/files/darktable-0.9.1-system-libraw.patch
deleted file mode 100644
index b631e74dd498..000000000000
--- a/media-gfx/darktable/files/darktable-0.9.1-system-libraw.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- darktable-0.9.1.orig/cmake/modules/FindLibraw.cmake
-+++ darktable-0.9.1/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.1.orig/src/CMakeLists.txt
-+++ darktable-0.9.1/src/CMakeLists.txt
-@@ -65,7 +65,6 @@
- 
- 
- include_directories(${CMAKE_CURRENT_SOURCE_DIR})
--include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/LibRaw)
- 
- # initial compiler flags
- add_definitions("-DHAVE_CONFIG_H")
-@@ -117,7 +116,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})
-@@ -289,17 +288,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")
-@@ -314,9 +302,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.1.orig/src/common/imageio.c
-+++ darktable-0.9.1/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/metadata.xml b/media-gfx/darktable/metadata.xml
index c1175e6f3005..2275ca3ad8f7 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -8,7 +8,6 @@
 	</maintainer>
 	<use>
 		<flag name="flickr">Add support for uploading photos to flickr</flag>
-		<flag name="gconf">Add support for the gconf backend</flag>
 		<flag name="rawspeed">Enable the rawspeed backend</flag>
 		<flag name="slideshow">Build the opengl slideshow viewer</flag>
 	</use>