Respect ldflags. Bug #435048. Version bump. #438604

Package-Manager: portage-2.1.11.30/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2

4 files changed, 141 insertions, 15 deletions

diff --git a/media-gfx/shotwell/ChangeLog b/media-gfx/shotwell/ChangeLog
index 964f7596f076..bcca411dc98f 100644
--- a/media-gfx/shotwell/ChangeLog
+++ b/media-gfx/shotwell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/shotwell
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.38 2012/08/26 00:39:29 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.39 2012/10/28 19:30:02 hwoarang Exp $
+
+*shotwell-0.13.1 (28 Oct 2012)
+
+  28 Oct 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/shotwell-0.13.1-ldflags.patch, +shotwell-0.13.1.ebuild:
+  Respect ldflags. Bug #435048. Version bump. #438604
 
   26 Aug 2012; Markos Chandras <hwoarang@gentoo.org> -files/0.10-ldflags.patch,
   -files/0.11.0-ldflags.patch, -files/shotwell-0.10.1-libraw-config.patch,
diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index d6b814b7658d..6f5da9cef237 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,24 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX shotwell-0.13.1-ldflags.patch 1142 SHA256 d7fe75551807d7998c9494c9c065c611f98dbfd8db2b09bed8a1430048063b12 SHA512 036a99134afb69ab8f7ded853aec427f5c3289cab753c1796be71e75544ae18fdd628a82c628c1f6939c852c6abaf3b2841b4155fdb4831a8c091bdc5761d5c3 WHIRLPOOL 088c4fa519c32d36f663411468daa0b5547855d3d744f148282ea86c5743a4601669f2b82a9d5581a1dc34dfce3b001ee55810a96515e1db6316985857a1ed3b
 DIST shotwell-0.12.3.tar.bz2 1649746 SHA256 1388f0ea5a27e1c1a1ab33302c6304cca1fadfb649aa879d11e406c7ede15601 SHA512 5b375e2dcc033ea8dadefdbaf4aaad4d6f9723e91dfab0717031f37bfbd5ea2121e73783e5ae467af56cc3796e0b8b06cfc42bf3ee236daa87dfba974163f620 WHIRLPOOL 95c993406a3af4f30fbd8bbb858d375d61b339b5133aff5ad6e77bbf66e358afb9c2f51f19e788f35ed6f38fea36154180077ad35f5948e980b156644f06bd61
+DIST shotwell-0.13.1.tar.xz 1497664 SHA256 e548c3274410e0696ffcd051eabd38ca2a507031f36b7203c1e68966815fa735 SHA512 947d1b430ae346925e035870d33c6de51e12c7d1a7a9611826ee8ad6c8175eb1f7a67a7a31ae7ac60477f32611c3aa4fd8551a2528165549663df900f16dfbae WHIRLPOOL ca2b08c0c6c2c4c2a119a1ca0026e70ed362b76c692724094f7ebbfaf9cd9351e013e4f3502a72c57780d8ad62d3d3c66361bdccb5ccc913bc508d91df128235
 EBUILD shotwell-0.12.3.ebuild 1925 SHA256 6e75c6e0905a94fe7b9783d6b668e275f38e44762c46c4e917f006a5ea6854ae SHA512 b44dd27d8460f8b55641504f56c555f2c0b0f039634456d0c5233424201e50c6c41fd7370a34b265352c0f0d9515f74d0a9108cb6e9d6072c4e0d5210a5adca6 WHIRLPOOL 4c4277fd0b885da197248b8d78a17972aa2720c61529d024de161764462b1a8e434f3b14293192837f2fd21db4412df66e8fd19c21f3eec3fc62cf93276020dd
-MISC ChangeLog 6466 SHA256 5abb91c507683bbcc7f6cf74a7271b7caf2935235f3777521aba579669bff8ff SHA512 576846e14a9d53ed1a65aa3e14f417e43a2c53a5b9bba3bdec98056804bac6cba1700c21ab85857425d122da8bd0d331e925255b5e110ec1c02d4be2624bc057 WHIRLPOOL 2460e4fba0a28a356c925e5de6e34d49f7d43e51b47de9a28c8a3749bd6d11367cf697459aad8542ae93d839e53f11d0ab69de615c6d20e8bc9f3d606c1a8e3a
+EBUILD shotwell-0.13.1.ebuild 2267 SHA256 9bbf9a995ee1b539c05240acc96ef38cc741007b1f7c9ee3ff9dc16acfcefa25 SHA512 971bd5b35f40617dec9b647b0b460c03844caf8547bad57c81b2d023df2adff0a205b736c3c2352c011fa24dfae8dc1515077f63506fe4d03dc13d57041dffcb WHIRLPOOL 3b301a29995e7eceecee81b39955dbf823d4cf9fefcc8ae67006bb03ae0f6bd56daa2e8fd3c016c038144b06e98c02313e788622f6a3c962e887264ce73fae04
+MISC ChangeLog 6671 SHA256 e82f3ca3fad8f5fd852c79378bbc22586753c254ac52b5535ec523ef0f6645d1 SHA512 65490238082dff20ae3598430b1c5a4966b8ddf470bd0f1ea0279c6a141090c711bd07910b8aa5a39d6118acbf5444f81d479304a3b4cf8574748b0276ffaf98 WHIRLPOOL 5c08fae24c3adfc5d5e078cc009c5eabadc3758c1a6aeeed272e72d1e9e254c1fe47fb4697c31c4a968aed24610dbf4cb25fbc19d35f8dc3388857908a3c581d
 MISC metadata.xml 560 SHA256 f8a2f7fa486d790120922c0b5e111a8d6f7259f0394b133f048af6791868b103 SHA512 51dd6bb4c9cc0d6d61e66cf11dde1be61be17f744eb699e3998580444c60d8940613c67d4e08681db1b2b78824bafc49bcebaa04e9d0a70eb526048dc236e9e3 WHIRLPOOL fb7474e9505e84212459d63f7542d73a1034d9e7271def92ae05eb863c1f0492fe863fc74786e29bfbc17d32e17129dc95de5163747644c63cacc1092966fb9a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQOXBGAAoJEPqDWhW0r/LCkx0QAIajna2Ecxv8Y2i36neB5Tmy
-CMDLiYJO2jFHV/qaZCwtv/K7df+iuqjC1CcshnVmAsdr+kSD0q/YX1g6FFVFzX3R
-p3KVTXJxlsDQsIK5SddoMmZY0ZlowRvWLIKL/Ds5Cruzm2DGVI/J8RZi38AlT9dl
-5J8RNeg5c5J9H3Eqb6g9dSQPL83SyY1rIX4WMJ7IyfXQQgp/+c2yjcYNO+SOvcBk
-g8qPFEPfNWbJpyUnUn98wPbdlHnDABnU4lvJd4cSfQH2xDafnKUoAe0AqXJM4/cp
-NaERI0Mv+i0+Pc9/cCzbSCoH6NmBnz8QSnBRPpbMioGXU91l1Itcwt6uSADSK7Hl
-3yMumM4phXn1Rk9uVQH8ZpkBWIoX3AuICvJQvTYrt8lvH+G7pxf723j+49tWKvYi
-Z3/ODPPLlwb/n9beZGLlXQSiQ5QDLA3QNR7ZXQqMf/nut5vwvXyxb13qblTIGxqU
-T3+h01GEMStdQaNz70u0Fxu4+waoMwQYUS3pERl86DGAvXiSZO9WC/mmXCE8MJ+h
-vELSo5OWhqDdJRzlF1LfxpQWrADG3BJk23aX9TFpYGbPt7oQCbgCOuo3hJx51uid
-4sHqj0qLCTtIy9OY1Bxu70A+Ckue6gdH/daggBflDvcXhW/c9daprkK1ojgUth5L
-kttB1VpmopkqUnEV/ERJ
-=4JuS
+iQIcBAEBCAAGBQJQjYe6AAoJEPqDWhW0r/LCeAgP/i/So+CFXwRmW+E8fXbVFw5v
+ZUk4+p3d+XiruSPlI8J1r7GREmVREbn5M7L1h04FKwcihcHwirFwF6hVsQLrVLvN
+WzKhisBo004ZVzpv0uARN584cBQXdfX2zPJGwQ/nHdJ3FMW6fmj+nzimFa0bwXVy
+S3rTa6ZcWbS9WucXx1xd6Be8dPaxOTCOiTBykt7B1JPJfoYjqkI/iW4zt0G2YeL/
+u8M4etc4SVz3gHgF5l7t4DbqlSrFDWWlZ5BPTaVlaCtQOTYG2ds8lRAwq9hXLbC4
+um29mWbZSruw//OYjndvgM4xTv37nkl8tYxFdU6kO9cjX4ZAH7A77KtY2EYMhx2H
+PIw5jDMutKFjdxMZksYrcpHJpa7oqRAWhK0hzy3Ka1qh8dACEdpBQ4I8nHXvZAQz
+wW7ii+UQoRnHI6s58p11BvOyg00BYfVK/OIflbcdowpGpttFkQ1mGE2w5f+ZV78+
+qZMj01RLRX4i3WpwB993sIKYmSIcGMNpCjYQxAMKiN8C3H+G0FSWFp0p72M+U5xJ
+N6ne5kx1sFJiswIpgog8N0nr+3nNQ07NgXSyNJqAPD+J5kupGIv40YGi9Z8/LALU
+ASdyZrBMIRNXBhz+jYJsuCPn4oZKu1k3XIGggcW9q3iYW+bycSyAwc3WOivj57dp
+cKOdiq1ckTLSNtMubdoA
+=LIWy
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/shotwell/files/shotwell-0.13.1-ldflags.patch b/media-gfx/shotwell/files/shotwell-0.13.1-ldflags.patch
new file mode 100644
index 000000000000..97a9956bf52d
--- /dev/null
+++ b/media-gfx/shotwell/files/shotwell-0.13.1-ldflags.patch
@@ -0,0 +1,28 @@
+Respect LDFLAGS when building C files. Bug #435048
+Patch hasn't been sent upstream yet.
+Index: shotwell-0.13.1/Makefile
+===================================================================
+--- shotwell-0.13.1.orig/Makefile
++++ shotwell-0.13.1/Makefile
+@@ -697,7 +697,7 @@ $(EXPANDED_C_FILES): $(VALA_STAMP)
+ 	@
+ 
+ $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile
+-	$(CC) -c $(VALA_CFLAGS) $(CFLAGS) -o $@ $<
++	$(CC) -c $(VALA_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $<
+ 
+ $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN)
+ 	$(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) $(EXPORT_FLAGS) -o $@
+Index: shotwell-0.13.1/plugins/Makefile.plugin.mk
+===================================================================
+--- shotwell-0.13.1.orig/plugins/Makefile.plugin.mk
++++ shotwell-0.13.1/plugins/Makefile.plugin.mk
+@@ -54,7 +54,7 @@ $(CFILES): .stamp
+ 	@
+ 
+ $(OFILES): %.o: %.c $(CFILES)
+-	$(CC) -c $(CFLAGS) $(DEFINES) -I../.. $(CFILES)
++	$(CC) -c $(CFLAGS) $(LDFLAGS) $(DEFINES) -I../.. $(CFILES)
+ 
+ $(PLUGIN).so: $(OFILES)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -shared $(OFILES) $(LIBS) -o $@
diff --git a/media-gfx/shotwell/shotwell-0.13.1.ebuild b/media-gfx/shotwell/shotwell-0.13.1.ebuild
new file mode 100644
index 000000000000..0cebea6e0cb4
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.13.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.13.1.ebuild,v 1.1 2012/10/28 19:30:02 hwoarang Exp $
+
+EAPI=4
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.18"
+
+inherit gnome2 versionator eutils multilib toolchain-funcs vala
+
+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}/stable/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+LANGS="ar ast bg bn ca cs da de el en_GB es et eu fi fr gl he hi hr hu ia id it ja kk
+ko lt lv mk nb nl pa pl pt pt_BR ro ru sk sl sr sv ta te ta_IN te_IN th tr uk vi zh_CN zh_TW"
+
+for x in ${LANGS}; do
+	IUSE+="linguas_${x} "
+done
+
+RDEPEND="
+	>=dev-db/sqlite-3.5.9:3
+	>=dev-libs/dbus-glib-0.80
+	>=dev-libs/glib-2.30.0:2
+	>=dev-libs/json-glib-0.7.6
+	>=dev-libs/libgee-0.5.0:0
+	>=dev-libs/libunique-3.0.0:3
+	>=dev-libs/libxml2-2.6.32:2
+	>=media-libs/gexiv2-0.3.92
+	media-libs/gst-plugins-base:0.10
+	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.14.0
+	>=net-libs/libsoup-2.26.0:2.4
+	net-libs/rest:0.7
+	net-libs/webkit-gtk:3
+	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	sys-devel/m4"
+
+DOCS=( AUTHORS MAINTAINERS NEWS README THANKS )
+
+# This probabl comes from libraries that
+# shotwell-video-thumbnailer links to.
+# Nothing we can do at the moment. #435048
+QA_FLAGS_IGNORED="/usr/bin/${PN}-video-thumbnailer"
+
+pkg_setup() {
+	tc-export CC
+	G2CONF="${G2CONF}
+		--disable-schemas-compile
+		--disable-desktop-update
+		--disable-icon-update
+		--lib=$(get_libdir)"
+}
+
+src_prepare() {
+	vala_src_prepare
+	sed \
+		-e 's|CFLAGS :|CFLAGS +|g' \
+		-i plugins/Makefile.plugin.mk || die
+	# respect LDFLAGS. Bug #435048
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+}
+
+src_compile() {
+	local valaver="$(vala_best_api_version)"
+	emake VALAC="$(type -p valac-${valaver})"
+}
+
+src_install() {
+	gnome2_src_install
+	for x in ${LANGS}; do
+		if ! has ${x} ${LINGUAS}; then
+			find "${D}"/usr/share/locale/${x} -type f -exec rm {} \;
+		fi
+	done
+}