summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weber <xmw@gentoo.org>2013-04-13 02:23:48 +0000
committerMichael Weber <xmw@gentoo.org>2013-04-13 02:23:48 +0000
commit4d6ea5b3db63c7deaff2908086e1711de50d867b (patch)
tree5a27dcbeaa69de029945b02bbce1ed6360482ebd
parentDoes not work with rdeps, mask for testing (bug #447246) (diff)
downloadgentoo-2-4d6ea5b3db63c7deaff2908086e1711de50d867b.tar.gz
gentoo-2-4d6ea5b3db63c7deaff2908086e1711de50d867b.tar.bz2
gentoo-2-4d6ea5b3db63c7deaff2908086e1711de50d867b.zip
Move elektra include file in subdir (bug 447246, Andreas Sturmlechner)
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)
-rw-r--r--media-libs/oyranos/ChangeLog6
-rw-r--r--media-libs/oyranos/oyranos-0.4.0-r1.ebuild6
-rw-r--r--media-libs/oyranos/oyranos-0.9.1-r1.ebuild4
-rw-r--r--media-libs/oyranos/oyranos-0.9.1-r2.ebuild6
4 files changed, 11 insertions, 11 deletions
diff --git a/media-libs/oyranos/ChangeLog b/media-libs/oyranos/ChangeLog
index f848f171e371..12f44aa810b5 100644
--- a/media-libs/oyranos/ChangeLog
+++ b/media-libs/oyranos/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/oyranos
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.13 2013/04/13 00:39:08 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.14 2013/04/13 02:23:48 xmw Exp $
+
+ 13 Apr 2013; Michael Weber <xmw@gentoo.org> oyranos-0.4.0-r1.ebuild,
+ oyranos-0.9.1-r1.ebuild, oyranos-0.9.1-r2.ebuild:
+ Move elektra include file in subdir (bug 447246, Andreas Sturmlechner)
13 Apr 2013; Michael Weber <xmw@gentoo.org> oyranos-0.9.1-r2.ebuild:
Re-add include kdb.h patch for old elektra.
diff --git a/media-libs/oyranos/oyranos-0.4.0-r1.ebuild b/media-libs/oyranos/oyranos-0.4.0-r1.ebuild
index f4da01429ef2..a506d7b4d118 100644
--- a/media-libs/oyranos/oyranos-0.4.0-r1.ebuild
+++ b/media-libs/oyranos/oyranos-0.4.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.4.0-r1.ebuild,v 1.2 2012/11/23 21:55:30 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.4.0-r1.ebuild,v 1.3 2013/04/13 02:23:48 xmw Exp $
EAPI=4
@@ -15,7 +15,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="X doc static-libs test xinerama"
-RDEPEND="<app-admin/elektra-0.8.3
+RDEPEND="<app-admin/elektra-0.7.1-r3
dev-libs/libxml2
dev-libs/yajl
media-gfx/exiv2
diff --git a/media-libs/oyranos/oyranos-0.9.1-r1.ebuild b/media-libs/oyranos/oyranos-0.9.1-r1.ebuild
index 67490aeb1328..1c8fd41aaf55 100644
--- a/media-libs/oyranos/oyranos-0.9.1-r1.ebuild
+++ b/media-libs/oyranos/oyranos-0.9.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.1-r1.ebuild,v 1.1 2013/02/11 07:46:50 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.1-r1.ebuild,v 1.2 2013/04/13 02:23:48 xmw Exp $
EAPI=4
@@ -15,7 +15,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="X doc static-libs test xinerama"
-RDEPEND="app-admin/elektra
+RDEPEND="<app-admin/elektra-0.7.1-r3
dev-libs/libxml2
dev-libs/yajl
media-gfx/exiv2
diff --git a/media-libs/oyranos/oyranos-0.9.1-r2.ebuild b/media-libs/oyranos/oyranos-0.9.1-r2.ebuild
index f887983ad2c9..2b86e9bae333 100644
--- a/media-libs/oyranos/oyranos-0.9.1-r2.ebuild
+++ b/media-libs/oyranos/oyranos-0.9.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.1-r2.ebuild,v 1.2 2013/04/13 00:39:08 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-0.9.1-r2.ebuild,v 1.3 2013/04/13 02:23:48 xmw Exp $
EAPI=4
@@ -67,10 +67,6 @@ src_prepare() {
sed -e '/all:/s:oyranos-xforms-fltk::' \
-i oforms/oyranos_xforms.makefile || die
fi
- if has_version "<app-admin/elektra-0.8.3" ; then
- sed -e '/^#include/s:kdb.h:elektra-kdb.h:' \
- -i test.c test2.cpp oyranos_elektra.c || die
- fi
}
src_configure() {