summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Reffett <creffett@gentoo.org>2013-04-15 23:26:51 +0000
committerChris Reffett <creffett@gentoo.org>2013-04-15 23:26:51 +0000
commit68efdcea116e97805ee4cf608fbf3857bf3b2580 (patch)
treeee0adc79dd35ddbd75eaac56e91e3fb3bff0f8b7 /kde-misc
parentNet::DNS nextid() changed to be id(). Ensure that we are patched for it. (diff)
downloadgentoo-2-68efdcea116e97805ee4cf608fbf3857bf3b2580.tar.gz
gentoo-2-68efdcea116e97805ee4cf608fbf3857bf3b2580.tar.bz2
gentoo-2-68efdcea116e97805ee4cf608fbf3857bf3b2580.zip
Version bump wrt bug 464084, thanks to Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 42618354)
Diffstat (limited to 'kde-misc')
-rw-r--r--kde-misc/kolor-manager/ChangeLog11
-rw-r--r--kde-misc/kolor-manager/files/FindOyranos.cmake30
-rw-r--r--kde-misc/kolor-manager/kolor-manager-0.99.ebuild4
-rw-r--r--kde-misc/kolor-manager/kolor-manager-1.0.1.ebuild29
4 files changed, 70 insertions, 4 deletions
diff --git a/kde-misc/kolor-manager/ChangeLog b/kde-misc/kolor-manager/ChangeLog
index 3c202c943f30..cb76fccab869 100644
--- a/kde-misc/kolor-manager/ChangeLog
+++ b/kde-misc/kolor-manager/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for kde-misc/kolor-manager
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kolor-manager/ChangeLog,v 1.4 2012/11/11 17:10:41 johu Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kolor-manager/ChangeLog,v 1.5 2013/04/15 23:26:51 creffett Exp $
+
+*kolor-manager-1.0.1 (15 Apr 2013)
+
+ 15 Apr 2013; Chris Reffett <creffett@gentoo.org> +files/FindOyranos.cmake,
+ +kolor-manager-1.0.1.ebuild, kolor-manager-0.99.ebuild:
+ Version bump wrt bug 464084, thanks to Andreas Sturmlechner
+ <andreas.sturmlechner@gmail.com>
*kolor-manager-0.99 (11 Nov 2012)
diff --git a/kde-misc/kolor-manager/files/FindOyranos.cmake b/kde-misc/kolor-manager/files/FindOyranos.cmake
new file mode 100644
index 000000000000..ae709b9df84c
--- /dev/null
+++ b/kde-misc/kolor-manager/files/FindOyranos.cmake
@@ -0,0 +1,30 @@
+find_package(PkgConfig)
+pkg_check_modules(OYRANOS oyranos)
+
+
+if(OYRANOS_CFLAGS AND OYRANOS_LIBRARY_DIRS)
+
+ # query pkg-config asking for Oyranos >= 0.4.0
+ EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --atleast-version=0.9.0 oyranos RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
+
+ if(_return_VALUE STREQUAL "0")
+ set(OYRANOS_FOUND TRUE)
+ set(HAVE_OYRANOS TRUE)
+ else(_return_VALUE STREQUAL "0")
+ message(STATUS "Oyranos >= 0.9.0 was found")
+ endif(_return_VALUE STREQUAL "0")
+endif(OYRANOS_CFLAGS AND OYRANOS_LIBRARY_DIRS)
+
+if (OYRANOS_FOUND)
+ if (NOT Oyranos_FIND_QUIETLY)
+ message(STATUS "Found OYRANOS: ${OYRANOS_LIBRARY_DIRS} ${OYRANOS_INCLUDE_DIRS}")
+ endif (NOT Oyranos_FIND_QUIETLY)
+else (OYRANOS_FOUND)
+ if (NOT Oyranos_FIND_QUIETLY)
+ message(STATUS "Oyranos was NOT found.")
+ endif (NOT Oyranos_FIND_QUIETLY)
+ if (Oyranos_FIND_REQUIRED)
+ message(FATAL_ERROR "Could NOT find Oyranos")
+ endif (Oyranos_FIND_REQUIRED)
+endif (OYRANOS_FOUND)
+
diff --git a/kde-misc/kolor-manager/kolor-manager-0.99.ebuild b/kde-misc/kolor-manager/kolor-manager-0.99.ebuild
index 5dce4edfa92a..31f434e09c5b 100644
--- a/kde-misc/kolor-manager/kolor-manager-0.99.ebuild
+++ b/kde-misc/kolor-manager/kolor-manager-0.99.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/kde-misc/kolor-manager/kolor-manager-0.99.ebuild,v 1.1 2012/11/11 17:10:41 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kolor-manager/kolor-manager-0.99.ebuild,v 1.2 2013/04/15 23:26:51 creffett Exp $
EAPI=4
diff --git a/kde-misc/kolor-manager/kolor-manager-1.0.1.ebuild b/kde-misc/kolor-manager/kolor-manager-1.0.1.ebuild
new file mode 100644
index 000000000000..3d0db94f42af
--- /dev/null
+++ b/kde-misc/kolor-manager/kolor-manager-1.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kolor-manager/kolor-manager-1.0.1.ebuild,v 1.1 2013/04/15 23:26:51 creffett Exp $
+
+EAPI=5
+
+inherit eutils kde4-base
+
+DESCRIPTION="KControl module for Oyranos CMS cross desktop settings."
+HOMEPAGE="http://www.oyranos.org/wiki/index.php?title=Kolor-manager"
+SRC_URI="http://dev.gentoo.org/~creffett/distfiles/${P}.tar.xz"
+
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug"
+
+DEPEND="
+ >=media-libs/oyranos-0.9.0
+ media-libs/libXcm
+ x11-libs/libXrandr
+"
+RDEPEND="${DEPEND}"
+
+src_prepare(){
+ if has_version "<media-libs/oyranos-0.9.3" ; then
+ cp "${FILESDIR}"/FindOyranos.cmake cmake/modules/ || die
+ fi
+}