From cc1be1048ceb6131f470b8e3852e10c75953eda9 Mon Sep 17 00:00:00 2001 From: Christoph Mende Date: Fri, 11 Nov 2011 16:20:30 +0000 Subject: [PATCH] Version bump, clean up Package-Manager: portage-2.1.10.31/cvs/Linux x86_64 --- media-gfx/shotwell/ChangeLog | 8 ++- media-gfx/shotwell/Manifest | 16 ++--- media-gfx/shotwell/shotwell-0.10.1.ebuild | 59 ------------------- media-gfx/shotwell/shotwell-0.11.1.ebuild | 58 ------------------ ...l-0.11.2.ebuild => shotwell-0.11.6.ebuild} | 4 +- 5 files changed, 15 insertions(+), 130 deletions(-) delete mode 100644 media-gfx/shotwell/shotwell-0.10.1.ebuild delete mode 100644 media-gfx/shotwell/shotwell-0.11.1.ebuild rename media-gfx/shotwell/{shotwell-0.11.2.ebuild => shotwell-0.11.6.ebuild} (92%) diff --git a/media-gfx/shotwell/ChangeLog b/media-gfx/shotwell/ChangeLog index 93f5f77cab4a..0927cbc56dcb 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.29 2011/10/20 17:14:30 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.30 2011/11/11 16:20:30 angelos Exp $ + +*shotwell-0.11.6 (10 Nov 2011) + + 10 Nov 2011; Christoph Mende -shotwell-0.10.1.ebuild, + -shotwell-0.11.1.ebuild, -shotwell-0.11.2.ebuild, +shotwell-0.11.6.ebuild: + Version bump, clean up *shotwell-0.11.5 (20 Oct 2011) diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest index ded17b0e5264..b62028aa0c83 100644 --- a/media-gfx/shotwell/Manifest +++ b/media-gfx/shotwell/Manifest @@ -5,22 +5,18 @@ AUX 0.10-ldflags.patch 1223 RMD160 9eb78d092161abc1f92c35dfc24db717a54881ee SHA1 AUX 0.11.0-ldflags.patch 1139 RMD160 e0e73d17e759aa17c97b6254086ea92f43ce2fed SHA1 b1eb84490f5d7038318770c7b0066e2b7cf243f3 SHA256 43cdc9d1031c88beb556eb1f6e12d0e4e7b9697c50c4b8422eb98208a2819580 AUX shotwell-0.10.1-libraw-config.patch 661 RMD160 3430d8191b72136c80a8fd46d8bfc8c0c5c9dc60 SHA1 dd0c98b309079394a975702ecd2fdc70819b95c1 SHA256 4d4588b0185599776b73753453ec445e19e748f822c271cea433504924f44d8f AUX shotwell-0.11.2-libraw-0.14.patch 3918 RMD160 702d82572c16c171f211aa8c36ae108f06affd89 SHA1 ffb170274d214741de277fa0f5452dd741d7c7ee SHA256 e204f2dbe270cbabef8cc1eded03e81d7befe995add35464e3f04246851312bb -DIST shotwell-0.10.1.tar.bz2 1483679 RMD160 44cccbebf4f1bf024229da9afbcc6d4db510be96 SHA1 abd6e771168910943101b62d76f7768a49e69be9 SHA256 f6ef4782780af201402afeaf8f9484d5579cedff75fbf07b22587bb7cef69893 -DIST shotwell-0.11.1.tar.bz2 1545164 RMD160 51b96dccfe8665551fb416d7a444c5f94b0358a1 SHA1 84c85291a22bf7a95f51cf0341d12ea0355f1415 SHA256 e4539bd427ac19c40c883705caa78b67f77d6d1a1bfbcffe9202b348e5643648 -DIST shotwell-0.11.2.tar.bz2 1554533 RMD160 7f44508683e1c67c3cd3194639f17b8ecfc2f89a SHA1 4ae17d180c809a70a0e69303c6be3c3ce3f81c17 SHA256 94a10fcc17fcbe36c07fa7d69d093785c8f9e2f78be66600415aa3fd542c9ad5 DIST shotwell-0.11.3.tar.bz2 1570881 RMD160 d28fa6e7683ee1a747e5ec82d3589ccd21b1efd7 SHA1 da98a5fab6d94f97e902f111ce17001b74d45772 SHA256 ff6561562b7673febad1d520d48c70b4eb5b6bd5ff916f8a14d8ce64677f0374 DIST shotwell-0.11.5.tar.bz2 1570803 RMD160 00bc024d323bf4285972f67f157fbce8709dbe94 SHA1 7ca5bd82b0c39ba6f47e40c24b4a521c0729db1b SHA256 8432628f6130aef64b096924cb3ec821148b9dd89b51a8fe9b74ce1efa03364a -EBUILD shotwell-0.10.1.ebuild 1574 RMD160 d0c146667c4865398f9aad741dbdb5a954b59ced SHA1 652e869a2e468f24f4ffe0964d11ac40d7f737d3 SHA256 c2c690fb5dd5519d4fcbd8750e5a9aa3cceda807ddeda3eeb0f2782f101ee35a -EBUILD shotwell-0.11.1.ebuild 1533 RMD160 9f3e1546f575bebb990bedf48600c8d53b879204 SHA1 1dbc1678ec063a10e0ebc76a17c4d559c1627f98 SHA256 28c3ae3f73b5941028b396108f029293aaa2efc196568c2052bf79d08669d87f -EBUILD shotwell-0.11.2.ebuild 1453 RMD160 456b83b5253c84a97e824f24a0fa0b43c11c7045 SHA1 638398f7ca08fcc489c7db146e4388be9a6cb235 SHA256 a30a207ed93818c95b2622b74c180b51c7b03464d72a1af0686b1d453af05d17 +DIST shotwell-0.11.6.tar.bz2 1570860 RMD160 d3a93a90f5feea65a630f8f30585a3ebbe558635 SHA1 2dd2b46dc56f6562522f75bd79eefdc80cbb2a49 SHA256 fab71137f336536565ea18b94591eb81c4ac696f627fe3d5ff361c9a55397af8 EBUILD shotwell-0.11.3.ebuild 1459 RMD160 f10b2418e8663215cb655e621cf31e6c8c0f36bf SHA1 47924c34c72e4673a5087bca0233e6c7c3f8562a SHA256 8601ef7732a94295fdb754f00023b98081318958314f0dde83da69604c9f25d2 EBUILD shotwell-0.11.5.ebuild 1459 RMD160 349a8579f0d355e05db184a78bba94f61f99fa7d SHA1 16c6af77d73979a8f5bbc9ab3d20fc4450e2689e SHA256 2b2e72e3c569fe8c0cb7f6a9feebb75c7bdfbd15b47182a0f5136075e9779a0d -MISC ChangeLog 5024 RMD160 57cbc00a6e5d13b719c21d33a1c29bde8997d5cf SHA1 560b45389882497fa6a92eff3defff4b21c60883 SHA256 299e0357f6abad6331cb81ded924fe05058c5d86052fa76d523690731b14dfe9 +EBUILD shotwell-0.11.6.ebuild 1459 RMD160 6b6478b5f9195a6c3c30364f0d17a8cc98014a75 SHA1 ff33e3d0154f08e3817567eda7f562c3c811f981 SHA256 688ff816e1192d72dd0c967082477f9c06070f4680dcde69d4c315639d907aff +MISC ChangeLog 5236 RMD160 1170f4453563f31d6140318ad6daa8255f3237c0 SHA1 b3f818491cc306fb75a2f4b1984e830bf69f71b2 SHA256 276a4976f5dc6026b2fb55e9045140436d86c6cee94ba67fee9c8272ec700f16 MISC metadata.xml 559 RMD160 7401908d71c9cb6774d73efd5147400b26abf9a9 SHA1 33c34915641d1174b6a945ddee2680b81674394b SHA256 62028c58796cd83bc8e6c552a98830ca8ed22f852b1708eddae549e2f6ecd791 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk6gVvsACgkQmWq1bYTyC0P6ZQD/d91PhipO87pwU4SM/4hhs4A9 -pWFLQlU9HwxXXbUZg/kBAL9DJn0ys+OxRZxMK28fC0BB5YflYsH2udAGMoVBgKJI -=k2r/ +iF4EAREIAAYFAk68OvAACgkQmWq1bYTyC0M7vgD/WBH7Lla/E+cd/1Jqp2cDS0dp +TPKsvKBl++Dauwd+xBIA/0DAwKxpeFS6VVdPzO5JZM+9xvzpsWANnndieQTcwaru +=jFbe -----END PGP SIGNATURE----- diff --git a/media-gfx/shotwell/shotwell-0.10.1.ebuild b/media-gfx/shotwell/shotwell-0.10.1.ebuild deleted file mode 100644 index e8e858d0ee55..000000000000 --- a/media-gfx/shotwell/shotwell-0.10.1.ebuild +++ /dev/null @@ -1,59 +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/shotwell/shotwell-0.10.1.ebuild,v 1.5 2011/09/17 08:43:27 angelos Exp $ - -EAPI=4 -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:0 - >=dev-libs/libunique-1:1 - >=dev-libs/libxml2-2.6.32:2 - >=gnome-base/gconf-2.22.0: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-171[gudev] >=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}"/0.10-ldflags.patch \ - "${FILESDIR}"/${P}-libraw-config.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 -} diff --git a/media-gfx/shotwell/shotwell-0.11.1.ebuild b/media-gfx/shotwell/shotwell-0.11.1.ebuild deleted file mode 100644 index 841a1e185e4c..000000000000 --- a/media-gfx/shotwell/shotwell-0.11.1.ebuild +++ /dev/null @@ -1,58 +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/shotwell/shotwell-0.11.1.ebuild,v 1.2 2011/09/17 08:43:27 angelos Exp $ - -EAPI=4 -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:0 - >=dev-libs/libunique-1:1 - >=dev-libs/libxml2-2.6.32:2 - >=gnome-base/gconf-2.22.0: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-171[gudev] >=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-compile - --disable-desktop-update - --disable-icon-update - --lib=$(get_libdir)" -} - -src_prepare() { - epatch \ - "${FILESDIR}"/0.11.0-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 -} diff --git a/media-gfx/shotwell/shotwell-0.11.2.ebuild b/media-gfx/shotwell/shotwell-0.11.6.ebuild similarity index 92% rename from media-gfx/shotwell/shotwell-0.11.2.ebuild rename to media-gfx/shotwell/shotwell-0.11.6.ebuild index f35e960d6688..dc82a03d9765 100644 --- a/media-gfx/shotwell/shotwell-0.11.2.ebuild +++ b/media-gfx/shotwell/shotwell-0.11.6.ebuild @@ -1,6 +1,6 @@ # 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.11.2.ebuild,v 1.2 2011/10/04 18:19:58 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.11.6.ebuild,v 1.1 2011/11/11 16:20:30 angelos Exp $ EAPI=4 GCONF_DEBUG="no" @@ -49,7 +49,7 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${P}-libraw-0.14.patch + epatch "${FILESDIR}"/${PN}-0.11.2-libraw-0.14.patch } src_compile() { -- 2.26.2