Non-maintainer fix; Respect CC; Respect LDFLAGS, #356049; Respect multilib

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

3 files changed, 95 insertions, 1 deletions

diff --git a/media-gfx/shotwell/ChangeLog b/media-gfx/shotwell/ChangeLog
index adadecef6009..e8e460cb4534 100644
--- a/media-gfx/shotwell/ChangeLog
+++ b/media-gfx/shotwell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/shotwell
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.12 2011/04/08 07:04:18 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.13 2011/04/08 10:34:07 jlec Exp $
+
+*shotwell-0.9.1-r1 (08 Apr 2011)
+
+  08 Apr 2011; Justin Lecher <jlec@gentoo.org> +files/0.9.1-ldflags.patch,
+  +shotwell-0.9.1-r1.ebuild:
+  Non-maintainer fix; Respect CC; Respect LDFLAGS, #356049; Respect multilib
 
   08 Apr 2011; Benedikt Böhm <hollow@gentoo.org> shotwell-0.9.1.ebuild:
   add missing DEPEND on gnome-vfs
diff --git a/media-gfx/shotwell/files/0.9.1-ldflags.patch b/media-gfx/shotwell/files/0.9.1-ldflags.patch
new file mode 100644
index 000000000000..09cf321fe16e
--- /dev/null
+++ b/media-gfx/shotwell/files/0.9.1-ldflags.patch
@@ -0,0 +1,23 @@
+ Makefile |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b62ebfd..1c57ff1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -614,7 +614,7 @@ $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
+ 	$(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --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) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@
+ 
+ $(PLUGINS_SO) $(EXTRA_PLUGINS_SO): $(PLUGINS_DIR)
+ 	@
+@@ -639,5 +639,5 @@ docs:
+ 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) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@
+ 
diff --git a/media-gfx/shotwell/shotwell-0.9.1-r1.ebuild b/media-gfx/shotwell/shotwell-0.9.1-r1.ebuild
new file mode 100644
index 000000000000..2d658eb74de9
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.9.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.9.1-r1.ebuild,v 1.1 2011/04/08 10:34:07 jlec Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit gnome2 versionator eutils multilib toolchain-funcs
+
+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/json-glib-0.7.6
+	>=dev-libs/libgee-0.5.0
+	>=dev-libs/libunique-1:1
+	>=dev-libs/libxml2-2.6.32:2
+	>=gnome-base/gconf-2.22.0:2
+	gnome-base/gnome-vfs:2
+	>=media-libs/gexiv2-0.2.0
+	media-libs/gstreamer:0.10
+	media-libs/lcms:2
+	>=media-libs/libexif-0.6.16
+	>=media-libs/libgphoto2-2.4.2
+	>=media-libs/libraw-0.9.0
+	>=net-libs/libsoup-2.26.0:2.4
+	>=net-libs/webkit-gtk-1.1.5:2
+	>=sys-fs/udev-145[extras]
+	>=x11-libs/gtk+-2.18.0:2"
+DEPEND="${RDEPEND}
+	>=dev-lang/vala-0.11.7:0.12"
+
+DOCS="AUTHORS MAINTAINERS NEWS README THANKS"
+
+pkg_setup() {
+	tc-export CC
+	G2CONF="${G2CONF}
+		--disable-schemas-install
+		--disable-desktop-update
+		--disable-icon-update
+		--lib=$(get_libdir)"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-ldflags.patch
+	gnome2_src_prepare
+
+	sed -e 's/valac/valac-0.12/' -i plugins/Makefile.plugin.mk || die
+	sed -e 's/valac/valac-0.12/' -i Makefile || die
+}
+
+src_install() {
+	# This is needed so that gnome2_gconf_savelist() works correctly.
+	insinto /etc/gconf/schemas
+	doins misc/shotwell.schemas || die "install gconf schema failed"
+	gnome2_src_install
+}