From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SGvXf-0003m1-RI for garchives@archives.gentoo.org; Sun, 08 Apr 2012 17:04:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1995DE0AD2; Sun, 8 Apr 2012 17:04:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C717BE0AD2 for ; Sun, 8 Apr 2012 17:04:06 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0C8591B40BA for ; Sun, 8 Apr 2012 17:04:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 46528E5436 for ; Sun, 8 Apr 2012 17:04:03 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1333904611.71c899eca8f214ba3863a086bfce6e2cdfd70349.dilfridge@gentoo> Subject: [gentoo-commits] dev/dilfridge:master commit in: media-plugins/kipi-plugins/files/, media-plugins/kipi-plugins/ X-VCS-Repository: dev/dilfridge X-VCS-Files: media-plugins/kipi-plugins/Manifest media-plugins/kipi-plugins/files/kipi-plugins-2.6.0_beta3-options.patch media-plugins/kipi-plugins/kipi-plugins-2.6.0_beta3.ebuild X-VCS-Directories: media-plugins/kipi-plugins/files/ media-plugins/kipi-plugins/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 71c899eca8f214ba3863a086bfce6e2cdfd70349 X-VCS-Branch: master Date: Sun, 8 Apr 2012 17:04:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f591a0d9-483d-46b5-9b1f-7f1207baf6b3 X-Archives-Hash: 1c9647f99050ebb55494108a485629b1 commit: 71c899eca8f214ba3863a086bfce6e2cdfd70349 Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Sun Apr 8 17:03:31 2012 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Sun Apr 8 17:03:31 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dilfridge.git;= a=3Dcommit;h=3D71c899ec [media-plugins/kipi-plugins] Version bump (Portage version: 2.1.10.56/git/Linux x86_64, unsigned Manifest commit) --- media-plugins/kipi-plugins/Manifest | 27 +---- .../files/kipi-plugins-2.6.0_beta3-options.patch | 31 +++++ .../kipi-plugins/kipi-plugins-2.6.0_beta3.ebuild | 117 ++++++++++++++= ++++++ 3 files changed, 150 insertions(+), 25 deletions(-) diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plu= gins/Manifest index 88b5cc9..b9d49f5 100644 --- a/media-plugins/kipi-plugins/Manifest +++ b/media-plugins/kipi-plugins/Manifest @@ -1,25 +1,2 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - -AUX kipi-plugins-1.7.0-expoblending.patch 570 RMD160 c08b628dceb39b4a2db= e15fd376256785dd8cacf SHA1 763aec7f286f4cd208aa38f5665c62986bcfaddb SHA25= 6 31788bac46a0af39e2b8475bdd84e07710af5d6655efbdaa6939795eb8b7d7f0 -AUX kipi-plugins-2.2.0-panorama.patch 637 RMD160 af10aa9d372525b726f6127= c5708c94ec0d8d2c6 SHA1 04ffe616b1bd516009b8ff46bf138fc3f3a620eb SHA256 d8= 3477c7b1c67342863aeb1b03ec6f8b7fa4a7b1ca0194d1d42e4ebaf920edee -DIST digikam-2.5.0.tar.bz2 54976375 RMD160 4ff1b5fbc2cc4a8cb9994f7c77960= 86418dd43fb SHA1 6cadb838669d1bdcbd6abb677889f7d68d696383 SHA256 55292c79= b41fd2c20ce0a821f388645436acb18b3b06b486747e17129114851a -EBUILD kipi-plugins-2.5.0.ebuild 3229 RMD160 462dd0ebc1905708d5e2abb2f28= e26649974c9d9 SHA1 71d1ec0170988abd4cdcc2586e7aac605fb554b9 SHA256 65d56c= d9ed327b1a21e191398a6da52067d6ac78f3174bc8db0501b0605cdd16 -MISC metadata.xml 961 RMD160 767e890545236003bd89a73778ca0ef347a67e9a SH= A1 a5d91c03c129d0ed92d792806ff6ccb22da972b6 SHA256 8a137c5797a41e37989bd7= 8aa7761c84a42b685b59b7f5b3ddbd1639b4637af0 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iQIcBAEBCgAGBQJPgbITAAoJENwGBM22xffesRAP/ApxaH1VVoxfRmyiaC5NHFZD -4YB+q2svUIawRAEbh6cAtg7vYayvaoPqD02I8E3qrsxMwKleiIBeVEdT4y1fJNkS -FPWr8ABQhm6v2j8C462YKOgPhfC/XIuXREGt3KY/NUhgc56DreaPi/bZbz8PbBnV -91ORJd/clG+g467LWMvNOnUzvfFiJYII/xd/aiE3nBRwRU4mQQSX/Xw0opFKfJnn -RnpeJCMsSugvVfg8c9xydjGkiwyXoxb8rOepoDRzVAUe9ru+5IwCvVzQaywsPOjR -lf74Crx0v0KVH/nmxnXYDOKPnHHPPPl4ThoZ5tZNqKmHQWFb1gxPvr1f0QJ5XJT5 -bb/fzDW5Kxvqsiam16d6f3qs06ljGfaqh9GT065uAMtJDizDwU562tcA+8hsJSYl -VEUpkbJuQjyP47uV41/dJQTVeMeRRb152SHpi+5CT2JUCglQ3fRNsCPW/5kgwprs -olaHZYRYCTQbaNPI98gVTjWhg2stT3O2Jd0IkYVkXpT/3g2lOCWjThvIWKMdAyH4 -gvOqvv3thEPK3IIYgmQlRRipHmWznH0ypyG4hvvmFLQy5q55v2yTddfrX74nOQC+ -zOyI6mRu8yaF/Y/RQX7/z5w1oRu1pal58LHUvknUi6+8VFvxQ2Gt2SMA3XQbFOza -dbsFkota7SKG/8bne0SJ -=3DQ+fx ------END PGP SIGNATURE----- +DIST digikam-2.5.0.tar.bz2 54976375 SHA256 55292c79b41fd2c20ce0a821f3886= 45436acb18b3b06b486747e17129114851a SHA512 e3d500e7719c059a425d77a0900590= 6361fee8ea584002b172393e6156e0d79d5c59a2498e84329b5e42e92dda2850a76c63652= 4392a113a489207b57d0b7ee7 WHIRLPOOL 8dfa904ab5cf2a7b082cd73ad8f02ffed2c72= e2d3542b9994c29417a77ddd7a749d075475200ec1a5a3fa21262deac6a7f35503ab269e6= 89eea37011a319b064 +DIST digikam-2.6.0-beta3.tar.bz2 55694232 SHA256 697ab7fdc0aff0a2a842df2= 1608158f2abd1f7a4619cae9818749012267e6fec SHA512 ab820f20e0a405b524270825= 580d01d1658decd3387f23368b17f871984515a9a97b8b65414a707785de2c90b1db2e1fe= a1b00809a0c045f52df978a7b85a8fa WHIRLPOOL 3602a0307c02daddee6c7af198da3e2= c9236a13aed2d3f7a2b477786991b4a011462ef97cd5e64fdf8ef76463425cb5a376b52da= 0a8a547a33b95081bda60141 diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-2.6.0_beta3-op= tions.patch b/media-plugins/kipi-plugins/files/kipi-plugins-2.6.0_beta3-o= ptions.patch new file mode 100644 index 0000000..86733b1 --- /dev/null +++ b/media-plugins/kipi-plugins/files/kipi-plugins-2.6.0_beta3-options.p= atch @@ -0,0 +1,31 @@ +diff -ruN digikam-2.6.0-beta3.orig/extra/kipi-plugins/CMakeLists.txt dig= ikam-2.6.0-beta3/extra/kipi-plugins/CMakeLists.txt +--- digikam-2.6.0-beta3.orig/extra/kipi-plugins/CMakeLists.txt 2012-04-0= 1 12:54:26.000000000 +0200 ++++ digikam-2.6.0-beta3/extra/kipi-plugins/CMakeLists.txt 2012-04-08 18:= 50:53.918419219 +0200 +@@ -391,7 +391,11 @@ + ADD_SUBDIRECTORY(picasawebexport) + ADD_SUBDIRECTORY(smug) + ADD_SUBDIRECTORY(printimages) +- ADD_SUBDIRECTORY(expoblending) ++ ++ IF(ENABLE_expoblending) ++ ADD_SUBDIRECTORY(expoblending) ++ ENDIF(ENABLE_expoblending) ++ + ADD_SUBDIRECTORY(kopete) + ADD_SUBDIRECTORY(batchprocessimages) + ADD_SUBDIRECTORY(rajceexport) +@@ -457,9 +461,11 @@ + ADD_SUBDIRECTORY(mediawiki) + ENDIF(MEDIAWIKI_FOUND) +=20 +- IF(Boost_FOUND) +- ADD_SUBDIRECTORY(panorama) +- ENDIF(Boost_FOUND) ++ IF(ENABLE_panorama) ++ IF(Boost_FOUND) ++ ADD_SUBDIRECTORY(panorama) ++ ENDIF(Boost_FOUND) ++ ENDIF(ENABLE_panorama) +=20 + # Laurent Montel : wallpaper is currently disabled. Waiting new api w= ith KDE 4.2 + # diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.6.0_beta3.ebuild b= /media-plugins/kipi-plugins/kipi-plugins-2.6.0_beta3.ebuild new file mode 100644 index 0000000..3415161 --- /dev/null +++ b/media-plugins/kipi-plugins/kipi-plugins-2.6.0_beta3.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugi= ns-2.5.0.ebuild,v 1.2 2012/04/04 19:32:31 ago Exp $ + +EAPI=3D4 + +OPENGL_REQUIRED=3D"optional" + +KDE_MINIMAL=3D"4.7" + +KDE_LINGUAS=3D"ar az be bg bn br bs ca cs csb cy da de el en_GB eo es et= eu fa fi fo fr fy ga +gl ha he hi hr hsb hu id is it ja ka kk km ko ku lb lo lt lv mi mk mn ms= mt nb nds ne nl nn +nso oc pa pl pt pt_BR ro ru rw se sk sl sq sr ss sv ta te tg th tr tt uk= uz ven vi wa xh +zh_CN zh_HK zh_TW zu" + +KDE_HANDBOOK=3D"optional" + +inherit flag-o-matic kde4-base + +MY_P=3D"digikam-${PV/_/-}" + +DESCRIPTION=3D"Plugins for the KDE Image Plugin Interface" +HOMEPAGE=3D"http://www.digikam.org/" +SRC_URI=3D"mirror://sourceforge/digikam/${MY_P}.tar.bz2" + +LICENSE=3D"GPL-2 + handbook? ( FDL-1.2 )" +KEYWORDS=3D"~amd64 ~x86" +SLOT=3D"4" +IUSE=3D"cdr calendar crypt debug expoblending gpssync +imagemagick ipod = mediawiki mjpeg panorama redeyes scanner vkontakte" + +DEPEND=3D" + $(add_kdebase_dep libkipi) + $(add_kdebase_dep libkdcraw) + $(add_kdebase_dep libkexiv2) + dev-libs/expat + dev-libs/libxml2 + dev-libs/libxslt + dev-libs/qjson + gpssync? ( media-libs/libkgeomap ) + media-libs/libpng + media-libs/tiff + virtual/jpeg + calendar? ( $(add_kdebase_dep kdepimlibs) ) + crypt? ( app-crypt/qca:2 ) + ipod? ( + media-libs/libgpod + x11-libs/gtk+:2 + mediawiki? ( >=3Dmedia-libs/libmediawiki-2.6.0_beta3 ) + ) + panorama? ( dev-libs/boost ) + redeyes? ( >=3Dmedia-libs/opencv-2.2.0-r10 ) + scanner? ( + $(add_kdebase_dep libksane) + media-gfx/sane-backends + ) + vkontakte? ( net-libs/libkvkontakte ) +" +RDEPEND=3D"${DEPEND} + cdr? ( app-cdr/k3b ) + expoblending? ( media-gfx/hugin ) + imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[ima= gemagick] ) ) + mjpeg? ( media-video/mjpegtools ) + panorama? ( + media-gfx/enblend + >=3Dmedia-gfx/hugin-2011.0.0 + ) +" + +S=3D${WORKDIR}/${MY_P}/extra/${PN} + +PATCHES=3D( + "${FILESDIR}/${PN}-2.6.0_beta3-options.patch" +) + +src_prepare() { + # prepare the handbook + mv "${WORKDIR}/${MY_P}/doc/${PN}" "${WORKDIR}/${MY_P}/extra/${PN}/doc" = || die + if use handbook; then + echo "add_subdirectory( doc )" >> CMakeLists.txt + fi + + # prepare the translations + mv "${WORKDIR}/${MY_P}/po" po || die + find po -name "*.po" -and -not -name "kipiplugin*.po" -exec rm {} + + echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die + echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die + echo "add_subdirectory( po )" >> CMakeLists.txt + + kde4-base_src_prepare +} + +src_configure() { + # Remove flags -floop-block -floop-interchange + # -floop-strip-mine due to bug #305443. + filter-flags -floop-block + filter-flags -floop-interchange + filter-flags -floop-strip-mine + + mycmakeargs+=3D( + $(cmake-utils_use_with ipod GLIB2) + $(cmake-utils_use_with ipod GObject) + $(cmake-utils_use_with ipod Gdk) + $(cmake-utils_use_with ipod Gpod) + $(cmake-utils_use_with calendar KdepimLibs) + $(cmake-utils_use_with gpssync KGeoMap) + $(cmake-utils_use_with mediawiki MEDIAWIKI) + $(cmake-utils_use_with redeyes OpenCV) + $(cmake-utils_use_with opengl OpenGL) + $(cmake-utils_use_with crypt QCA2) + $(cmake-utils_use_with scanner Sane) + $(cmake-utils_use_enable expoblending) + $(cmake-utils_use_enable panorama) + ) + + kde4-base_src_configure +}