Add sys-devel/m4 to DEPEND. Fixes bug #415003. Remove old ebuilds

(Portage version: 2.1.10.58/cvs/Linux x86_64)

5 files changed, 8 insertions, 174 deletions

diff --git a/media-gfx/shotwell/ChangeLog b/media-gfx/shotwell/ChangeLog
index 90a2fe286bee..66c700047213 100644
--- a/media-gfx/shotwell/ChangeLog
+++ b/media-gfx/shotwell/ChangeLog
@@ -1,6 +1,10 @@
 # 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.34 2012/05/07 07:58:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/ChangeLog,v 1.35 2012/05/11 21:37:05 hwoarang Exp $
+
+  11 May 2012; Markos Chandras <hwoarang@gentoo.org> -shotwell-0.11.3.ebuild,
+  -shotwell-0.11.5.ebuild, -shotwell-0.11.6.ebuild, shotwell-0.12.2.ebuild:
+  Add sys-devel/m4 to DEPEND. Fixes bug #415003. Remove old ebuilds
 
 *shotwell-0.12.2 (07 May 2012)
 
diff --git a/media-gfx/shotwell/shotwell-0.11.3.ebuild b/media-gfx/shotwell/shotwell-0.11.3.ebuild
deleted file mode 100644
index d67f6c1a09b3..000000000000
--- a/media-gfx/shotwell/shotwell-0.11.3.ebuild
+++ /dev/null
@@ -1,57 +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.3.ebuild,v 1.1 2011/10/14 17:23:13 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.14.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}"/${PN}-0.11.2-libraw-0.14.patch
-}
-
-src_compile() {
-	emake VALAC="$(type -p valac-0.12)"
-}
diff --git a/media-gfx/shotwell/shotwell-0.11.5.ebuild b/media-gfx/shotwell/shotwell-0.11.5.ebuild
deleted file mode 100644
index f36a89d4d61c..000000000000
--- a/media-gfx/shotwell/shotwell-0.11.5.ebuild
+++ /dev/null
@@ -1,57 +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.5.ebuild,v 1.1 2011/10/20 17:14:30 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.14.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}"/${PN}-0.11.2-libraw-0.14.patch
-}
-
-src_compile() {
-	emake VALAC="$(type -p valac-0.12)"
-}
diff --git a/media-gfx/shotwell/shotwell-0.11.6.ebuild b/media-gfx/shotwell/shotwell-0.11.6.ebuild
deleted file mode 100644
index dc82a03d9765..000000000000
--- a/media-gfx/shotwell/shotwell-0.11.6.ebuild
+++ /dev/null
@@ -1,57 +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.6.ebuild,v 1.1 2011/11/11 16:20:30 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.14.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}"/${PN}-0.11.2-libraw-0.14.patch
-}
-
-src_compile() {
-	emake VALAC="$(type -p valac-0.12)"
-}
diff --git a/media-gfx/shotwell/shotwell-0.12.2.ebuild b/media-gfx/shotwell/shotwell-0.12.2.ebuild
index 8010c8a80f4c..09841c924492 100644
--- a/media-gfx/shotwell/shotwell-0.12.2.ebuild
+++ b/media-gfx/shotwell/shotwell-0.12.2.ebuild
@@ -1,6 +1,6 @@
 # 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.12.2.ebuild,v 1.1 2012/05/07 07:58:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.12.2.ebuild,v 1.2 2012/05/11 21:37:05 hwoarang Exp $
 
 EAPI=4
 GCONF_DEBUG="no"
@@ -37,7 +37,8 @@ RDEPEND="
 	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] )
 	x11-libs/gtk+:3"
 DEPEND="${RDEPEND}
-	dev-lang/vala:0.16"
+	dev-lang/vala:0.16
+	sys-devel/m4"
 
 DOCS=( AUTHORS MAINTAINERS NEWS README THANKS )