From 8cf2a1223c6977be1be4ddf0ac89701d4a8fe454 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sat, 25 Jul 2015 12:34:34 +0000 Subject: Update the live ebuild. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/157 by a17r. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) --- media-libs/oyranos/ChangeLog | 7 +- .../oyranos/files/oyranos-9999-buildsystem.patch | 183 --------------------- media-libs/oyranos/metadata.xml | 2 +- media-libs/oyranos/oyranos-9999.ebuild | 57 ++++--- 4 files changed, 41 insertions(+), 208 deletions(-) delete mode 100644 media-libs/oyranos/files/oyranos-9999-buildsystem.patch (limited to 'media-libs/oyranos') diff --git a/media-libs/oyranos/ChangeLog b/media-libs/oyranos/ChangeLog index f9cbbf952808..36bf23551f3e 100644 --- a/media-libs/oyranos/ChangeLog +++ b/media-libs/oyranos/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/oyranos # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.28 2015/05/27 20:31:04 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/ChangeLog,v 1.29 2015/07/25 12:34:34 mgorny Exp $ + + 25 Jul 2015; Michał Górny + -files/oyranos-9999-buildsystem.patch, metadata.xml, oyranos-9999.ebuild: + Update the live ebuild. https://github.com/gentoo/gentoo-portage-rsync- + mirror/pull/157 by a17r. 27 May 2015; Matthias Maier oyranos-0.9.4-r2.ebuild, oyranos-0.9.5.ebuild, oyranos-9999.ebuild: diff --git a/media-libs/oyranos/files/oyranos-9999-buildsystem.patch b/media-libs/oyranos/files/oyranos-9999-buildsystem.patch deleted file mode 100644 index 7e9d03e805b6..000000000000 --- a/media-libs/oyranos/files/oyranos-9999-buildsystem.patch +++ /dev/null @@ -1,183 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -48,7 +48,7 @@ - FIND_PROGRAM(CMAKE_AR_TMP NAMES ar) - - # detect top level projects --FIND_PACKAGE( Yajl ) -+FIND_PACKAGE( Yajl REQUIRED ) - IF( HAVE_YAJL ) - INCLUDE_DIRECTORIES( ${YAJL_INCLUDE_DIRS} ) - LINK_DIRECTORIES( ${YAJL_LIBRARY_DIRS} ) -@@ -58,73 +58,16 @@ - IF( NOT HAVE_YAJL_VERSION_H ) - INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/yajl/ ) - ENDIF( NOT HAVE_YAJL_VERSION_H ) --ELSE( HAVE_YAJL ) -- IF(CMAKE_VERSION VERSION_GREATER 2.8.0) -- #include(ExternalProject) -- #ExternalProject_Add( yajl -- #SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/yajl -- #CONFIGURE_COMMAND cmake ${CMAKE_CURRENT_SOURCE_DIR}/yajl -- #BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/yajl -- #BUILD_COMMAND ${MAKE} -- # skip installation -- #INSTALL_COMMAND echo ) -- ADD_SUBDIRECTORY( yajl ) -- INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/yajl ) -- LINK_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/yajl ) -- SET( YAJL_LIBRARIES yajl-static ) -- ENDIF() -- - ENDIF( HAVE_YAJL ) - --FIND_PACKAGE( Elektra ) -+FIND_PACKAGE( Elektra REQUIRED ) -+SET( HAVE_ELEKTRA 1 ) - IF(HAVE_ELEKTRA) - SET( ELEKTRA_SPEC "Requires: elektra - BuildRequires: elektra-devel" ) - INCLUDE_DIRECTORIES( ${ELEKTRA_INCLUDE_DIRS} ) - LINK_DIRECTORIES( ${ELEKTRA_LIBRARY_DIRS} ) - STRING(REPLACE ";" " " ELEKTRA_PC_LDFLAGS "${ELEKTRA_STATIC_LDFLAGS}") --ELSE(HAVE_ELEKTRA) -- SET( ELEKTRA_VERSION elektra-0.7.1 ) -- MESSAGE( "-- Using internal Elektra: ${ELEKTRA_VERSION}" ) -- INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/${ELEKTRA_VERSION}/src/include -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/include ) -- SET( ELEKTRA_LIBRARIES_STATIC -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdb.o -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdbhandle.o -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-key.o -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyset.o -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-trie.o -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdbhighlevel.o -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-kdbcapability.o -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyhelpers.o -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keymeta.o -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyname.o -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keytest.o -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-keyvalue.o -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-serialize.o -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-split.o -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektra/libelektra_a-exported_symbols.o -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libloader/libloader_static_a-kdbLibLoader.o -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libhelper/libhelper_static_a-internal.o -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libhelper/libhelper_static_a-helper.o -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/backends/filesys/libelektra_filesys_a-filesys.o -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektratools/libelektratools_a-kdbtools.o -- ${CMAKE_BINARY_DIR}/${ELEKTRA_VERSION}/src/libelektratools/libelektratools_a-stream.o -- ) -- SET( ELEKTRA_LIBRARIES -- ${LIBXML2_LIBRARIES} -- ) -- IF(CMAKE_VERSION VERSION_GREATER 2.8.0) -- include(ExternalProject) -- ExternalProject_Add( ${ELEKTRA_VERSION} -- SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${ELEKTRA_VERSION} -- # GCC flags (-fPIC) will fail on Windows, without we get relocation R_X86_64_32 errors -- CONFIGURE_COMMAND CFLAGS=-fPIC ${CMAKE_CURRENT_SOURCE_DIR}/${ELEKTRA_VERSION}/configure --enable-static --enable-shared=false -- BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${ELEKTRA_VERSION} -- BUILD_COMMAND ${MAKE} -- # skip installation -- INSTALL_COMMAND echo ) -- ENDIF() - ENDIF(HAVE_ELEKTRA) - - #now add all directories ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -100,7 +100,9 @@ - INCLUDE_DIRECTORIES( ${XCM_INCLUDE_DIRS} ) - LINK_DIRECTORIES( ${XCM_LIBRARY_DIRS} ) - --FIND_PACKAGE( X11 ) -+IF(WANT_X11) -+FIND_PACKAGE( X11 REQUIRED ) -+ENDIF(WANT_X11) - IF(X11_FOUND) - INCLUDE_DIRECTORIES( ${X11_INCLUDE_DIRS} ) - LINK_DIRECTORIES( ${X11_LIBRARY_DIRS} ) -@@ -123,27 +125,36 @@ - LINK_DIRECTORIES( ${XXF86VM_LIBRARY_DIRS} ) - ENDIF(X11_FOUND) - --FIND_PACKAGE( CUPS ) -+IF(WANT_CUPS) -+FIND_PACKAGE( Cups REQUIRED ) -+SET( HAVE_CUPS 1 ) -+ENDIF(WANT_CUPS) - IF(HAVE_CUPS) - INCLUDE_DIRECTORIES( ${CUPS_INCLUDE_DIR} ) - LINK_DIRECTORIES( ${CUPS_LIBRARYS} ) - ENDIF(HAVE_CUPS) - --FIND_PACKAGE( Cairo ) -+IF(WANT_CAIRO) -+FIND_PACKAGE( Cairo REQUIRED) -+ENDIF(WANT_CAIRO) - IF(HAVE_CAIRO) - INCLUDE_DIRECTORIES( ${CAIRO_INCLUDE_DIR}/cairo ) - INCLUDE_DIRECTORIES( ${CAIRO_INCLUDE_DIR} ) - LINK_DIRECTORIES( ${CAIRO_LIBRARY_DIRS} ) - ENDIF(HAVE_CAIRO) - --FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui) -+IF(WANT_QT4) -+FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui REQUIRED) -+ENDIF(WANT_QT4) - IF(QT_FOUND) - SET( HAVE_QT 1 ) - INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIRS} ) - LINK_DIRECTORIES( ${QT_LIBRARY_DIRS} ) - ENDIF(QT_FOUND) - --FIND_PACKAGE( Fltk ) -+IF(WANT_FLTK) -+FIND_PACKAGE( FLTK REQUIRED) -+ENDIF(WANT_FLTK) - IF(FLTK_FOUND) - SET( HAVE_FLTK 1 ) - INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIRS} ) -@@ -159,7 +170,9 @@ - SET( LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} PARENT_SCOPE) - ENDIF(LIBXML2_FOUND) - --FIND_PACKAGE( LibRaw ) -+IF(WANT_LIBRAW) -+FIND_PACKAGE( LibRaw REQUIRED ) -+ENDIF(WANT_LIBRAW) - IF( HAVE_LIBRAW ) - # TRY_COMPILE( - # HAVE_LIBRAW_REALLY -@@ -182,7 +195,9 @@ - MESSAGE( "HAVE_LIBRAW_PLUGIN: ${HAVE_LIBRAW_PLUGIN}" ) - ENDIF() - --FIND_PACKAGE( Exif2 ) -+IF(WANT_EXIV2) -+FIND_PACKAGE( Exif2 REQUIRED ) -+ENDIF(WANT_EXIV2) - IF(HAVE_EXIV2) - INCLUDE_DIRECTORIES( ${EXIV2_INCLUDE_DIRS} ) - LINK_DIRECTORIES( ${EXIV2_LIBRARY_DIRS} ) ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -33,7 +33,9 @@ - INSTALL( FILES ${MAN1_PAGES} DESTINATION share/man/man1 ) - INSTALL( FILES ${MAN3_PAGES} DESTINATION share/man/man3 ) - --FIND_PACKAGE( Doxygen ) -+IF(WANT_HTML) -+ FIND_PACKAGE( Doxygen REQUIRED ) -+ENDIF(WANT_HTML) - IF( DOXYGEN_FOUND ) - - ADD_CUSTOM_COMMAND( OUTPUT html -@@ -43,5 +45,5 @@ - ADD_CUSTOM_TARGET( docu ALL - DEPENDS html ) - -- INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/${PACKAGE_NAME} ) -+ INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc/${PACKAGE_NAME}-${OYRANOS_VERSION} ) - ENDIF() diff --git a/media-libs/oyranos/metadata.xml b/media-libs/oyranos/metadata.xml index d0bb9c4671c3..10d1ba182e9e 100644 --- a/media-libs/oyranos/metadata.xml +++ b/media-libs/oyranos/metadata.xml @@ -6,6 +6,6 @@ Michael Weber - oyranos + oyranos-cms/oyranos diff --git a/media-libs/oyranos/oyranos-9999.ebuild b/media-libs/oyranos/oyranos-9999.ebuild index 730538cb310d..167c3e48784a 100644 --- a/media-libs/oyranos/oyranos-9999.ebuild +++ b/media-libs/oyranos/oyranos-9999.ebuild @@ -1,35 +1,35 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild,v 1.7 2015/05/27 20:31:04 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/oyranos/oyranos-9999.ebuild,v 1.8 2015/07/25 12:34:34 mgorny Exp $ EAPI=5 inherit eutils flag-o-matic cmake-utils cmake-multilib -DESCRIPTION="colour management system allowing to share various settings across applications and services" +DESCRIPTION="Colour management system allowing to share various settings across applications and services" HOMEPAGE="http://www.oyranos.org/" if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/${PN}-cms/${PN}.git" inherit git-r3 KEYWORDS="" else - SRC_URI="mirror://sourceforge/oyranos/Oyranos/Oyranos%200.9/${P}.tar.bz2" + SRC_URI="https://github.com/oyranos-cms/oyranos/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" fi LICENSE="BSD" SLOT="0" -IUSE="X cairo cups doc exif fltk qt4 raw test" +IUSE="X cairo cups doc exif fltk jpeg qt4 qt5 raw test tiff" -RDEPEND=" +#OY_LINGUAS="cs;de;eo;eu;fr;ru" #TODO + +COMMON_DEPEND=" || ( =app-admin/elektra-0.7*:0[${MULTILIB_USEDEP}] >=app-admin/elektra-0.8.4:0[${MULTILIB_USEDEP}] ) >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] >=dev-libs/yajl-2.0.4-r1[${MULTILIB_USEDEP}] - media-libs/icc-profiles-basiccolor-printing2009 - media-libs/icc-profiles-openicc >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] >=media-libs/libXcm-0.5.3[${MULTILIB_USEDEP}] @@ -37,19 +37,29 @@ RDEPEND=" cups? ( >=net-print/cups-1.7.1-r1[${MULTILIB_USEDEP}] ) exif? ( >=media-gfx/exiv2-0.23-r2[${MULTILIB_USEDEP}] ) fltk? ( x11-libs/fltk:1 ) - qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) + jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) + qt5? ( + dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 + ) + !qt5? ( + qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) + ) raw? ( >=media-libs/libraw-0.15.4[${MULTILIB_USEDEP}] ) + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) X? ( >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}] >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} doc? ( app-doc/doxygen media-gfx/graphviz )" +RDEPEND="${COMMON_DEPEND} + media-libs/icc-profiles-basiccolor-printing2009 + media-libs/icc-profiles-openicc" -DOCS="AUTHORS.md ChangeLog.md README.md" +DOCS=( AUTHORS.md ChangeLog.md README.md ) RESTRICT="test" MULTILIB_CHOST_TOOLS=( @@ -65,8 +75,6 @@ src_prepare() { einfo remove bundled libs rm -rf elektra* yajl || die - epatch "${FILESDIR}/${P}"-buildsystem.patch - if use fltk ; then #src/examples does not include fltk flags append-cflags $(fltk-config --cflags) @@ -80,17 +88,20 @@ multilib_src_configure() { local libdir=$(get_libdir) local mycmakeargs=( -DLIB_SUFFIX=${libdir#lib} - - $(usex cairo -DWANT_CAIRO=1 "") - $(usex cups -DWANT_CUPS=1 "") - $(usex doc -DWANT_HTML=1 "") - $(usex exif -DWANT_EXIV2=1 "") - $(usex raw -DWANT_LIBRAW=1 "") - $(usex X -DWANT_X11=1 "") - - # only used in programs - $(multilib_native_usex fltk -DWANT_FLTK=1 "") - $(multilib_native_usex qt4 -DWANT_QT4=1 "") + -DUSE_SYSTEM_ELEKTRA=YES + -DUSE_SYSTEM_YAJL=YES + -DUSE_Qt4=$(usex '!qt5') + -DCMAKE_DISABLE_FIND_PACKAGE_Cairo=$(usex '!cairo') + -DCMAKE_DISABLE_FIND_PACKAGE_Cups=$(usex '!cups') + -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(usex '!doc') + -DCMAKE_DISABLE_FIND_PACKAGE_Exif2=$(usex '!exif') + -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex '!jpeg') + -DCMAKE_DISABLE_FIND_PACKAGE_LibRaw=$(usex '!raw') + -DCMAKE_DISABLE_FIND_PACKAGE_TIFF=$(usex '!tiff') + -DCMAKE_DISABLE_FIND_PACKAGE_X11=$(usex '!X') + -DCMAKE_DISABLE_FIND_PACKAGE_Fltk=$(multilib_native_usex fltk OFF ON) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt4=$(multilib_native_usex qt4 OFF ON) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=$(multilib_native_usex qt5 OFF ON) ) cmake-utils_src_configure -- cgit v1.2.3-65-gdbad