summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2011-03-07 12:17:43 +0000
committerJustin Lecher <jlec@gentoo.org>2011-03-07 12:17:43 +0000
commitfd12c9d2e01b4a18752b874f1afa9564e0ac3fe3 (patch)
treed6df337d90fbcc69b6860e7eb624e261bb5eee71
parentAdd ~arm/~s390/~sh (diff)
downloadgentoo-2-fd12c9d2e01b4a18752b874f1afa9564e0ac3fe3.tar.gz
gentoo-2-fd12c9d2e01b4a18752b874f1afa9564e0ac3fe3.tar.bz2
gentoo-2-fd12c9d2e01b4a18752b874f1afa9564e0ac3fe3.zip
Correct Slots for gtk 3 introduction to tree, fixed vala dep version, #357743
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
-rw-r--r--media-libs/memphis/ChangeLog8
-rw-r--r--media-libs/memphis/memphis-0.2.2.ebuild9
-rw-r--r--media-libs/memphis/memphis-0.2.3.ebuild14
3 files changed, 16 insertions, 15 deletions
diff --git a/media-libs/memphis/ChangeLog b/media-libs/memphis/ChangeLog
index 8b7cf5213c0c..b6e3a5ab0cf7 100644
--- a/media-libs/memphis/ChangeLog
+++ b/media-libs/memphis/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/memphis
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/memphis/ChangeLog,v 1.4 2010/09/19 20:11:37 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/memphis/ChangeLog,v 1.5 2011/03/07 12:17:43 jlec Exp $
+
+ 07 Mar 2011; Justin Lecher <jlec@gentoo.org> memphis-0.2.2.ebuild,
+ memphis-0.2.3.ebuild:
+ Correct Slots for gtk 3 introduction to tree, fixed vala dep version, #357743
*memphis-0.2.3 (19 Sep 2010)
diff --git a/media-libs/memphis/memphis-0.2.2.ebuild b/media-libs/memphis/memphis-0.2.2.ebuild
index 45bea4bd3ac1..cf8bdc6cfe24 100644
--- a/media-libs/memphis/memphis-0.2.2.ebuild
+++ b/media-libs/memphis/memphis-0.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/memphis/memphis-0.2.2.ebuild,v 1.3 2010/06/25 06:52:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/memphis/memphis-0.2.2.ebuild,v 1.4 2011/03/07 12:17:43 jlec Exp $
EAPI="3"
@@ -19,10 +19,10 @@ IUSE="debug doc introspection vala"
RDEPEND="
>=dev-libs/expat-2.0.1
- >=dev-libs/glib-2.3.4
+ dev-libs/glib:2
>=x11-libs/cairo-1.8.8
introspection? ( dev-libs/gobject-introspection )
- vala? ( dev-lang/vala )"
+ vala? ( dev-lang/vala:0.12 )"
DEPEND="${RDEPEND}
doc? ( >=dev-util/gtk-doc-1.12 )"
@@ -35,6 +35,7 @@ src_prepare() {
src_configure() {
CFLAGS="${CFLAGS}" \
+ VALAC=$(type -p valac-0.12) \
econf \
$(use_enable debug) \
$(use_enable doc gtk-doc) \
diff --git a/media-libs/memphis/memphis-0.2.3.ebuild b/media-libs/memphis/memphis-0.2.3.ebuild
index 6b2b1b33647c..b21e028d69b5 100644
--- a/media-libs/memphis/memphis-0.2.3.ebuild
+++ b/media-libs/memphis/memphis-0.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/memphis/memphis-0.2.3.ebuild,v 1.1 2010/09/19 20:11:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/memphis/memphis-0.2.3.ebuild,v 1.2 2011/03/07 12:17:43 jlec Exp $
EAPI="3"
@@ -19,22 +19,18 @@ IUSE="debug doc introspection vala"
RDEPEND="
>=dev-libs/expat-2.0.1
- >=dev-libs/glib-2.3.4
+ dev-libs/glib:2
>=x11-libs/cairo-1.8.8
introspection? ( dev-libs/gobject-introspection )
- vala? ( dev-lang/vala )"
+ vala? ( dev-lang/vala:0.12 )"
DEPEND="${RDEPEND}
doc? ( >=dev-util/gtk-doc-1.12 )"
DOCS=(AUTHORS ChangeLog NEWS README)
-#src_prepare() {
-# sed '/Werror/d' -i configure.ac
-# eautoreconf
-#}
-
src_configure() {
CFLAGS="${CFLAGS}" \
+ VALAC=$(type -p valac-0.12) \
econf \
$(use_enable debug) \
$(use_enable doc gtk-doc) \