version bump wrt #334821; remove old version since they don't build with current vala versions

(Portage version: 2.2_rc83/cvs/Linux x86_64)

4 files changed, 16 insertions, 179 deletions

diff --git a/media-gfx/shotwell/ChangeLog b/media-gfx/shotwell/ChangeLog
index 2803ce58fd0d..3183e2967867 100644
--- a/media-gfx/shotwell/ChangeLog
+++ b/media-gfx/shotwell/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/shotwell
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.5 2010/08/22 14:06:51 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.6 2010/09/19 08:24:01 hollow Exp $
+
+*shotwell-0.7.2 (19 Sep 2010)
+
+  19 Sep 2010; Benedikt Böhm <hollow@gentoo.org> -shotwell-0.5.2.ebuild,
+  -shotwell-0.6.1.ebuild, -files/shotwell-0.6.1-libraw.patch,
+  +shotwell-0.7.2.ebuild:
+  version bump wrt #334821; remove old version since they don't build with
+  current vala versions
 
   22 Aug 2010; Benedikt Böhm <hollow@gentoo.org>
   +files/shotwell-0.6.1-libraw.patch:
diff --git a/media-gfx/shotwell/files/shotwell-0.6.1-libraw.patch b/media-gfx/shotwell/files/shotwell-0.6.1-libraw.patch
deleted file mode 100644
index 0b48e6e986f9..000000000000
--- a/media-gfx/shotwell/files/shotwell-0.6.1-libraw.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- Makefile.orig	2010-07-04 15:54:45.974241667 +0300
-+++ Makefile	2010-07-04 16:00:10.277241950 +0300
-@@ -126,7 +126,7 @@
- 	FixedKeyFile.vapi \
- 	ExtendedPosix.vapi \
- 	LConv.vapi \
--	libraw.vapi \
-+	libraw_r.vapi \
- 	gdk-none.vapi
- 
- RESOURCE_FILES = \
-@@ -196,8 +196,6 @@
- 	LConv \
- 	gdk-none
- 
--# libraw is not listed (see note below); when libraw-config is no longer needed, it should be
--# added to this list
- EXT_PKGS = \
- 	atk \
- 	gdk-2.0 \
-@@ -205,10 +203,8 @@
- 	gtk+-2.0 \
- 	libexif \
- 	sqlite3 \
--	gexiv2
--
--LIBRAW_PKG = \
--	libraw
-+	gexiv2 \
-+	libraw_r
- 
- ifdef LINUX
- EXT_PKGS += \
-@@ -223,17 +219,13 @@
- 	gdk-x11-2.0
- endif
- 
--# libraw is handled separately (see note below); when libraw-config is no longer needed, the version
--# should be added to this list
- EXT_PKG_VERSIONS = \
- 	gee-1.0 >= 0.5.0 \
- 	gtk+-2.0 >= 2.18.0 \
- 	libexif >= 0.6.16 \
- 	sqlite3 >= 3.5.9 \
--	gexiv2 >= 0.1.0
--
--LIBRAW_VERSION = \
--	0.9.0
-+	gexiv2 >= 0.1.0 \
-+	libraw_r >= 0.9.0
- 
- ifdef LINUX
- EXT_PKG_VERSIONS += \
-@@ -247,7 +239,7 @@
- 	dbus-glib-1 >= 0.80
- endif
- 
--PKGS = $(EXT_PKGS) $(LOCAL_PKGS) $(LIBRAW_PKG)
-+PKGS = $(EXT_PKGS) $(LOCAL_PKGS)
- 
- ifndef BUILD_DIR
- BUILD_DIR=src
-@@ -276,7 +268,7 @@
- DIST_FILES = Makefile configure minver $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) \
- 	$(EXPANDED_SRC_HEADER_FILES) $(EXPANDED_RESOURCE_FILES) $(TEXT_FILES) $(EXPANDED_ICON_FILES) \
- 	$(EXPANDED_SYS_INTEGRATION_FILES) $(EXPANDED_PO_FILES) po/shotwell.pot windows/install-deps \
--	windows/shotwell.rc windows/winstall.iss src/windows.c src/GConf.vala libraw-config
-+	windows/shotwell.rc windows/winstall.iss src/windows.c src/GConf.vala
- 
- DIST_TAR = $(PROGRAM)-$(VERSION).tar
- DIST_TAR_BZ2 = $(DIST_TAR).bz2
-@@ -318,14 +310,9 @@
- CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE
- endif
- 
--# Packaged libraw is not widely available, so we must fake what would be in its .pc file
--# if not available.
--ifdef LINUX
--LIBRAW_CONFIG=./libraw-config
--endif
--
--ifdef WINDOWS
--LIBRAW_CONFIG=./libraw-config --windows
-+ifneq (,$(findstring fopenmp,$(shell pkg-config --cflags libraw_r)))
-+# If libraw is built with OpenMP support, we'll need this.
-+CFLAGS += -fopenmp
- endif
- 
- $(LANG_STAMP): $(EXPANDED_PO_FILES)
-@@ -447,10 +434,6 @@
- else ifdef EXT_PKGS
- 	@pkg-config --print-errors --exists $(EXT_PKGS)
- endif
--# Check for libraw manually, but not on Windows, where install-deps is used
--ifndef WINDOWS
--	@$(LIBRAW_CONFIG) --exists=$(LIBRAW_VERSION)
--endif
- endif
- 	@ type msgfmt > /dev/null || ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Shotwell. ' ; exit 1 )
- 	mkdir -p $(BUILD_DIR)
-@@ -468,15 +451,15 @@
- 	@
- 
- $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
--	$(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $<
-+	$(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $<
- 
- $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
--	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@
-+	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@
- 
- glade: lib$(PROGRAM).so
- 
- lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP)
--	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@
-+	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -shared -o $@
- 
- shotwell-setup-$(VERSION).exe: $(PROGRAM) windows/winstall.iss
- 	iscc windows\winstall.iss
diff --git a/media-gfx/shotwell/shotwell-0.6.1.ebuild b/media-gfx/shotwell/shotwell-0.6.1.ebuild
deleted file mode 100644
index e37a92e83613..000000000000
--- a/media-gfx/shotwell/shotwell-0.6.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.6.1.ebuild,v 1.1 2010/08/22 07:30:17 hollow Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2 versionator eutils
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="http://www.yorba.org/shotwell/"
-SRC_URI="http://www.yorba.org/download/${PN}/${MY_PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-db/sqlite-3.5.9:3
-	>=dev-libs/dbus-glib-0.80
-	>=dev-libs/libgee-0.5.0
-	>=dev-libs/libunique-1.0.0
-	>=dev-libs/libxml2-2.6.32
-	>=gnome-base/gconf-2.22.0
-	>=media-libs/libexif-0.6.16
-	>=media-libs/libgphoto2-2.4.2
-	>=net-libs/libsoup-2.26.0
-	>=net-libs/webkit-gtk-1.1.5
-	>=sys-fs/udev-145[extras]
-	>=x11-libs/gtk+-2.14.4:2
-	>=media-libs/libraw-0.9.0
-	>=media-libs/gexiv2-0.1.0"
-DEPEND="${RDEPEND}
-	=dev-lang/vala-0.8*"
-
-DOCS="AUTHORS MAINTAINERS NEWS README THANKS"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-libraw.patch" || die "libraw patch failed."
-	mv vapi/libraw{,_r}.vapi || die "renaming libraw.vapi failed"
-}
-
-pkg_setup() {
-	G2CONF="--disable-schemas-install
-		--disable-desktop-update
-		--disable-icon-update"
-}
-
-src_install() {
-	# This is needed so that gnome2_gconf_savelist() works correctly.
-	insinto "${EPREFIX}"/etc/gconf/schemas
-	doins misc/shotwell.schemas || die "install gconf schema failed"
-	gnome2_src_install
-}
diff --git a/media-gfx/shotwell/shotwell-0.5.2.ebuild b/media-gfx/shotwell/shotwell-0.7.2.ebuild
index 17c3dfbad05a..f8afbc3d9fcb 100644
--- a/media-gfx/shotwell/shotwell-0.5.2.ebuild
+++ b/media-gfx/shotwell/shotwell-0.7.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.5.2.ebuild,v 1.2 2010/08/22 07:30:17 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.7.2.ebuild,v 1.1 2010/09/19 08:24:01 hollow Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
 
-inherit gnome2 versionator
+inherit gnome2 versionator eutils
 
 MY_PV=$(get_version_component_range 1-2)
 DESCRIPTION="Open source photo manager for GNOME"
@@ -28,9 +28,12 @@ RDEPEND=">=dev-db/sqlite-3.5.9:3
 	>=net-libs/libsoup-2.26.0
 	>=net-libs/webkit-gtk-1.1.5
 	>=sys-fs/udev-145[extras]
-	>=x11-libs/gtk+-2.14.4:2"
+	>=x11-libs/gtk+-2.14.4:2
+	>=media-libs/libraw-0.9.0
+	>=media-libs/gexiv2-0.2.0
+	media-libs/lcms:2"
 DEPEND="${RDEPEND}
-	=dev-lang/vala-0.8*"
+	>=dev-lang/vala-0.9.5"
 
 DOCS="AUTHORS MAINTAINERS NEWS README THANKS"