[gentoo-commits] repo/gentoo:master commit in: media-gfx/shotwell/, media-gfx/shotwell/files/

[Pacho Ramos]

commit:     36fa6d812919c0e396f0b13be467f22ab999a2d0
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 15:35:25 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jul  2 17:10:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36fa6d81

media-gfx/shotwell: Drop old

Package-Manager: portage-2.3.0_rc1

 media-gfx/shotwell/Manifest                        |   1 -
 .../shotwell/files/shotwell-0.13.1-ldflags.patch   |  28 -----
 media-gfx/shotwell/shotwell-0.22.0-r1.ebuild       | 117 ---------------------
 media-gfx/shotwell/shotwell-0.22.0.ebuild          | 112 --------------------
 4 files changed, 258 deletions(-)

diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest
index 021fa5c..fa786cf 100644
--- a/media-gfx/shotwell/Manifest
+++ b/media-gfx/shotwell/Manifest
@@ -1,4 +1,3 @@
-DIST shotwell-0.22.0.tar.xz 1872952 SHA256 01b192c5c1c188ecd11bfdb6143d8f177f313c7eab7fe320bd20ac3ca352f831 SHA512 486f27a1fa06512a925ecae60504f3cbc487d44834f635efd0897dd20cb304a731c08133ab4b04b32a754235fc8c63dc9b05787b1a0c72a98c89ca91c64f452c WHIRLPOOL 8b93b6a92822c26aa7962f30e7402322371db1e6d297d7cd4e612f01f0418bcf2ee3598954e7d2a59d62f7e9704479bb24cb6fcf4263ab5315668c20543445c3
 DIST shotwell-0.23.1.tar.xz 1963512 SHA256 e24d33ff19f1902fa9595ef73288784f6332bfa99d40171efe60ab2ac68d358a SHA512 c47da700f28a8c14e6ea81069399d381b5a2eb33f6bd4c21763d42d25d9f0f6dcb2894a8b6ebf9967809fc828ea65b222be7002a4ff6f6a6165dbecdac66f96f WHIRLPOOL e99c29ed18cbcedcc5b975509d33cc4a7af0ab4e6f41e373c9f6c9fc1a3560e3eff7c383202dd78352f5a156d1d5a556275e2e3bac7f7c536c74375c04d65817
 DIST shotwell-icons.tar.bz2 61397 SHA256 edab0b34992dab8e1d397c30a4dca2ef3dad601c6c75e9c1cc771040089762c2 SHA512 b06ce3bb34728253bc3a3643ff7adde38ed7939961d79e001ae445e71435efc8aaefa94e5a3306a10abb9821511d2421590db7488bf7a95c8e5d6d677ecc712c WHIRLPOOL 783c5d0f354791cc8a9ec47aadda2ab3fdc2c73add236306f641422d02ecd6ff36ee38a45d356cd805cd592358471e24f27b67e8e24694523cf4f6340d7ca8bb
 DIST shotwell.1 1238 SHA256 7f4036f14a6c599835bd121d63705ddc766388aae8c6414eb3a405c85b9a5014 SHA512 8090d5d339a44992d2543ba9ed1bb6e0eb18da8d3fe6ad4f95f917d3aca352e6af0b8c21a7da3a8be9aa1cb04a13e8602d9db8484d4801547cfadc6c40500ad4 WHIRLPOOL cb3c1ef3cb6a577fa94d0aec4dfc06ee84a1f77771268e3217704fed269cd0cd3c220a4e68d270c152b34dc2e438e193d47aee87dd891a39fd8236a6d269eb3b

diff --git a/media-gfx/shotwell/files/shotwell-0.13.1-ldflags.patch b/media-gfx/shotwell/files/shotwell-0.13.1-ldflags.patch
deleted file mode 100644
index 97a9956..0000000
--- a/media-gfx/shotwell/files/shotwell-0.13.1-ldflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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.22.0-r1.ebuild b/media-gfx/shotwell/shotwell-0.22.0-r1.ebuild
deleted file mode 100644
index 677f5aa..0000000
--- a/media-gfx/shotwell/shotwell-0.22.0-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.30"
-VALA_MAX_API_VERSION="0.30"
-
-inherit eutils gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-SRC_URI="
-	mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz
-	http://pkgs.fedoraproject.org/cgit/shotwell.git/plain/shotwell.1
-	http://pkgs.fedoraproject.org/cgit/shotwell.git/plain/shotwell-icons.tar.bz2
-	"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-CORE_SUPPORTED_LANGUAGES="
-	af ar as ast bg bn bn_IN bs ca cs da de el en_GB eo es et eu fi fr gd gl gu
-	he hi hr hu ia id it ja kk km kn ko ky lt lv mk ml mr nb nl nn or pa pl pt
-	pt_BR ro ru sk sl sr sr@latin sv ta te th tr uk vi zh_CN zh_HK zh_TW"
-
-for x in ${CORE_SUPPORTED_LANGUAGES}; do
-	IUSE+="linguas_${x} "
-done
-
-RDEPEND="
-	app-text/gnome-doc-utils
-	>=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.8.5:0.8
-	>=dev-libs/libxml2-2.6.32:2
-	>=dev-util/desktop-file-utils-0.13
-	gnome-base/dconf
-	>=media-libs/gexiv2-0.4.90
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
-	media-libs/lcms:2
-	>=media-libs/libexif-0.6.16:=
-	>=media-libs/libgphoto2-2.4.2:=
-	>=media-libs/libraw-0.13.2:=
-	>=net-libs/libsoup-2.26.0:2.4
-	>=net-libs/rest-0.7:0.7
-	>=net-libs/webkit-gtk-1.4:3
-	virtual/libgudev:=[introspection]
-	>=x11-libs/gtk+-3.12.2:3[X]"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=sys-devel/m4-1.4.13"
-
-DOCS=( AUTHORS MAINTAINERS NEWS README THANKS )
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-pkg_setup() {
-	tc-export CC
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		--disable-desktop-update
-		--disable-icon-update
-		--prefix=/usr
-		--lib=$(get_libdir)"
-}
-
-src_prepare() {
-	local x
-	local linguas="en_GB ${LINGUAS}"
-	vala_src_prepare
-	sed \
-		-e 's|CFLAGS :|CFLAGS +|g' \
-		-i plugins/Makefile.plugin.mk || die
-	epatch \
-		"${FILESDIR}"/${PN}-0.13.1-ldflags.patch
-
-	# remove disabled lenguages from build
-	for x in ${CORE_SUPPORTED_LANGUAGES}; do
-		if ! has ${x} ${linguas}; then
-			sed -i "/^${x}$/d" "${S}"/po/LINGUAS || die
-		fi
-	done
-}
-
-src_configure() {
-	./configure \
-		${G2CONF} \
-		|| die
-}
-
-src_compile() {
-	local valaver="$(vala_best_api_version)"
-	emake VALAC="$(type -p valac-${valaver})"
-}
-
-src_install() {
-	local res
-	gnome2_src_install
-
-	doman "${DISTDIR}"/${PN}.1
-	for res in 16 22 24 32 48 256; do
-		doicon -s ${res} "${WORKDIR}"/${res}x${res}/*
-	done
-}

diff --git a/media-gfx/shotwell/shotwell-0.22.0.ebuild b/media-gfx/shotwell/shotwell-0.22.0.ebuild
deleted file mode 100644
index 366fbda..0000000
--- a/media-gfx/shotwell/shotwell-0.22.0.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.26"
-VALA_MAX_API_VERSION="0.26"
-
-inherit eutils gnome2 multilib toolchain-funcs vala versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DESCRIPTION="Open source photo manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
-SRC_URI="
-	mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz
-	http://pkgs.fedoraproject.org/cgit/shotwell.git/plain/shotwell.1
-	http://pkgs.fedoraproject.org/cgit/shotwell.git/plain/shotwell-icons.tar.bz2
-	"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-CORE_SUPPORTED_LANGUAGES="
-	af ar as ast bg bn bn_IN ca cs da de el en_GB eo es et eu fi fr gd gl gu he
-	hi hr hu ia id it ja kk km kn ko ky lt lv mk ml mr nb nl nn or pa pl pt
-	pt_BR ro ru sk sl sr sv ta te th tr uk vi zh_CN zh_HK zh_TW"
-
-for x in ${CORE_SUPPORTED_LANGUAGES}; do
-	IUSE+="linguas_${x} "
-done
-
-RDEPEND="
-	app-text/gnome-doc-utils
-	>=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.8.5:0.8
-	>=dev-libs/libxml2-2.6.32:2
-	>=dev-util/desktop-file-utils-0.13
-	gnome-base/dconf
-	>=media-libs/gexiv2-0.4.90
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
-	media-libs/lcms:2
-	>=media-libs/libexif-0.6.16:=
-	>=media-libs/libgphoto2-2.4.2:=
-	>=media-libs/libraw-0.13.2:=
-	>=net-libs/libsoup-2.26.0:2.4
-	>=net-libs/rest-0.7:0.7
-	>=net-libs/webkit-gtk-1.4:3
-	virtual/libgudev:=[introspection]
-	>=x11-libs/gtk+-3.12.2:3[X]"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=sys-devel/m4-1.4.13"
-
-DOCS=( AUTHORS MAINTAINERS NEWS README THANKS )
-
-# This probably comes from libraries that
-# shotwell-video-thumbnailer links to.
-# Nothing we can do at the moment. #435048
-QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
-
-pkg_setup() {
-	tc-export CC
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		--disable-desktop-update
-		--disable-icon-update
-		--prefix=/usr
-		--lib=$(get_libdir)"
-}
-
-src_prepare() {
-	vala_src_prepare
-	sed \
-		-e 's|CFLAGS :|CFLAGS +|g' \
-		-i plugins/Makefile.plugin.mk || die
-	epatch \
-		"${FILESDIR}"/${PN}-0.13.1-ldflags.patch
-}
-
-src_configure() {
-	./configure \
-		${G2CONF} \
-		|| die
-}
-
-src_compile() {
-	local valaver="$(vala_best_api_version)"
-	emake VALAC="$(type -p valac-${valaver})"
-}
-
-src_install() {
-	local res
-	gnome2_src_install
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-			find "${D}"/usr/share/locale/${x} -type f -exec rm {} + || die
-		fi
-	done
-	doman "${DISTDIR}"/${PN}.1
-	for res in 16 22 24 32 48 256; do
-		doicon -s ${res} "${WORKDIR}"/${res}x${res}/*
-	done
-}