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 1SGuEg-00063g-IC for garchives@archives.gentoo.org; Sun, 08 Apr 2012 15:41:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CC9BAE09CA; Sun, 8 Apr 2012 15:40:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8D7DAE09CA for ; Sun, 8 Apr 2012 15:40:50 +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 C107A1B40A0 for ; Sun, 8 Apr 2012 15:40:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 14666E542C for ; Sun, 8 Apr 2012 15:40:48 +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: <1333897110.90efe83e93433f439eb9ec7eacad614138dae264.dilfridge@gentoo> Subject: [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/ X-VCS-Repository: dev/dilfridge X-VCS-Files: media-gfx/digikam/Manifest media-gfx/digikam/digikam-2.3.0.ebuild media-gfx/digikam/digikam-2.4.1.ebuild X-VCS-Directories: media-gfx/digikam/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 90efe83e93433f439eb9ec7eacad614138dae264 X-VCS-Branch: master Date: Sun, 8 Apr 2012 15:40:48 +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: 68afc348-84db-4828-9e3f-b584ee49211a X-Archives-Hash: 85d786c2a11b493b160ce94de1c3248a commit: 90efe83e93433f439eb9ec7eacad614138dae264 Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Sun Apr 8 14:58:30 2012 +0000 Commit: Andreas H=C3=BCttel gentoo org> CommitDate: Sun Apr 8 14:58:30 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dilfridge.git;= a=3Dcommit;h=3D90efe83e [media-gfx/digikam] Remove old (Portage version: 2.1.10.56/git/Linux x86_64, RepoMan options: --force, s= igned Manifest commit with key B6C5F7DE) --- media-gfx/digikam/Manifest | 30 +++---- media-gfx/digikam/digikam-2.3.0.ebuild | 152 --------------------------= ------ media-gfx/digikam/digikam-2.4.1.ebuild | 145 --------------------------= ---- 3 files changed, 13 insertions(+), 314 deletions(-) diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index fc17d91..4a23123 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -3,27 +3,23 @@ Hash: SHA512 =20 AUX digikam-2.5.0-boost148.patch 4133 RMD160 033b19386db95818d8f1aa7ac8b= 1384be8ec7169 SHA1 095ea8de1e353120f47ed41c0cd15a36d468efcb SHA256 e9adb1= 99ca4955f64275481231c6761c32b84cdcc8bfab9ddebab6864f0f4a9f AUX digikam-2.5.0-libkipi.patch 2670 RMD160 a82bf1c2797279ac5f195a3f296e= ce677a838583 SHA1 23268e63dcc39f9e4452aff6639489f16d2c462c SHA256 7652e78= 54998b03a6047779361801dc63aa42c1f0221ef2b5c0f0a25abf1e651 -DIST digikam-2.3.0.tar.bz2 54522109 RMD160 304bce5841f5d36a72a064784c90c= 91960c9a7c3 SHA1 15b8b16d7cce6ac50fb958d30166214f2f2b83ee SHA256 29ddf83a= 160817314e9274a35d678678da58006e41d961dcebc6afb0ab200a33 -DIST digikam-2.4.1.tar.bz2 54531119 RMD160 2a07c061927e7cec7a0128a68e60f= 9d7c6d1e78b SHA1 2ec3a20225462d277d5f0c3aa17b1ecfbb61f98c SHA256 aca967a4= cc5312923cb2340502eb10a571684c14cf63896a68a1796d0483de3b DIST digikam-2.5.0.tar.bz2 54976375 RMD160 4ff1b5fbc2cc4a8cb9994f7c77960= 86418dd43fb SHA1 6cadb838669d1bdcbd6abb677889f7d68d696383 SHA256 55292c79= b41fd2c20ce0a821f388645436acb18b3b06b486747e17129114851a -EBUILD digikam-2.3.0.ebuild 4045 RMD160 69f49da4f45b4338dab884fa09a1d03c= 728863cc SHA1 d8673baceb9692057a6811e23fc9d872eb50d332 SHA256 6f14cd55cab= a84399ab6ca0f5b5539f7d8a553477e28644e42160b3ea6a49e17 -EBUILD digikam-2.4.1.ebuild 3779 RMD160 ae3417da8b3dd7720e8099458b1ab5cf= 2835b1a2 SHA1 c29f3d4c178699a85a045ce7fdf485b8afe9ca60 SHA256 67177511b82= 432bb24096be539428a8a7b0160aa513c69039ed6388fde790dae EBUILD digikam-2.5.0.ebuild 4197 RMD160 cd406b2bab0a40c52ed6a03aa36764b2= 26406aa6 SHA1 cee756c8a06606acfd79379c085fc32e1c41789a SHA256 844f1cd90ed= 191aa990c483a76e8951d8968b0d3cab4c1f244ac114f861f21ac MISC metadata.xml 648 RMD160 7694bc7a07e2b35c60e2ed22981007ba0680dd1f SH= A1 15b78b8dee48c87b702a5705009b3eee46aa7ebd SHA256 fed8bb77a841bcbc558e06= fbe5f729a616152051924fa17fed0e527237f09f8c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -iQIcBAEBCgAGBQJPgad1AAoJENwGBM22xffejx8P/1RHtEG5Wsz4Aru6gYpoVR/p -/bbHJAM4HKFxQiWVXTmI//fj4q5n0MzrZT/O8PD31bvIok4FOHh6QTAzbSKLVr1K -aBA0RhB9O9JAfWOiCZ5CWJj6lHDuRFYdcHSDewnVjTb2b5HnVhbUs74j4LgYm+AM -0xE+NLRn3s6vcKUGXeYlHnQ9/ZX9/yU3SH9PnrCHCDXcjbK5EelYMqtS3DbzQlG1 -biruu8csqaoErN/irLo/2jN/ohDYypExn3s7eWUveQsJmoAAEnX38rvraj9yDZo1 -oO0TQT5R1TlqnrSOXKWjQF7b5gYfYnhuli5JpAGRuGDV0UKL9mZs2D3HAg93/Y0U -Diop+4yN5P6dKrVhud7WdN6sbfNV/ZIAuWbWdF27y+D/tgoeYn9EUz6zzHU0tehP -Dyor2/xObKV6cQ6ZEs+3quPWewi0HBfiyrbXY78y7WPYSw+p0Oe4LySxOCxVYKPx -mqfw49zVjpgDkn3r30nlwCNT6kU0dYgHWBOeb67np5jNG8wJkR0UMMd3rQ8jZV8v -XtZ8a9e4R+j595nZ9sAIlGpcELz1PLGn5e8R0SEoBdJqYdFHeLpG3YWz4IwArq4V -PGCQinlavTHDxVPNGgAhvkNqn0mKufsZYBWkYgc8IvKAGfguhYK7fgngEUFuw1aM -BL8t9QRHdobwlNrZtH5A -=3Dmj0p +iQIcBAEBCgAGBQJPgaeVAAoJENwGBM22xffePFkP/iluQNoOjHoArz70ryaeEfTh +6ZztE+bh8KJlKaMQQwW/3EbewdIgZkE4cK6+lauO5KpG5jGi4IEnerjtZOpz4Qdg +VPI9Nik/EdDlumKmPtyfeAppGK8iVjIZ87nYiVQ6fz9pVcnHUovgAhYmbXV7ju7a +xXT3bzH5xBZfMfO/fhpT0Hir2fPnYBAKl0IgyIMUdub/pxL/l1xOOurGqpGLLU1g +ChzCro3AdhWG//9LxajjNQnlmIU56TYYY86uZJwgTzltvjNtPoMEVHlccSrb/xJB +G8cA7X9E9PhMcnOXmhVG+SWGfYnxmzMZbQrMArDj5G7ZY4uZkYflGit22hhrE0WJ +HqmBLLlz16Gj9e/c+gQ1z9auPL6zk4+RN+QkMsy8bLv5N07ButcrpVeqIeivFRoR +746dhJnOQBZxnwDwWdPRc9DHI5SbFoJo1kHki/46awoMGsS7TjlRTYYnrqQp49Ar +CTRvygzt1ts9dO0KUY7zFq/8/y9v4DBu4Fby+ouEFR4a1i1j+rO5RW2UD/FEp6eE +zvQvn982bgOJ4AFKzdYQx4YpsVA8BuVuD8nysRYphuHq0SSIoQ6ogk1XxPoIkICF +JALG6P9C4oomGSIiVI7iNOF02XSqpyCrya58G2mNDfYGyFzE2jLzgIGbwwhNz7zl +JJVeWwwOfwBdx54BcVqU +=3D/1AA -----END PGP SIGNATURE----- diff --git a/media-gfx/digikam/digikam-2.3.0.ebuild b/media-gfx/digikam/d= igikam-2.3.0.ebuild deleted file mode 100644 index 4b2a706..0000000 --- a/media-gfx/digikam/digikam-2.3.0.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.3.0.ebuil= d,v 1.5 2012/02/12 16:01:42 dilfridge Exp $ - -EAPI=3D4 - -KDE_LINGUAS=3D"af 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 sr@Latn ss= sv ta te tg -th tr tt uk uz uz@cyrillic ven vi wa xh zh_CN zh_HK zh_TW zu" - -KDE_HANDBOOK=3D"optional" -CMAKE_MIN_VERSION=3D"2.8" -KDE_MINIMAL=3D"4.7" - -inherit kde4-base - -MY_P=3D"${PN}-${PV/_/-}" - -DESCRIPTION=3D"Digital photo management application for KDE" -HOMEPAGE=3D"http://www.digikam.org/" -SRC_URI=3D"mirror://sourceforge/${PN}/${MY_P}.tar.bz2" - -LICENSE=3D"GPL-2 - handbook? ( FDL-1.2 )" -KEYWORDS=3D"amd64 x86" -SLOT=3D"4" -IUSE=3D"addressbook debug doc gphoto2 mysql semantic-desktop themedesign= er +thumbnails video" - -CDEPEND=3D" - !!=3Dmedia-gfx/digikam-2.1.0-r1 - $(add_kdebase_dep kdelibs 'semantic-desktop=3D') - $(add_kdebase_dep libkdcraw) - $(add_kdebase_dep libkexiv2) - $(add_kdebase_dep libkipi) - $(add_kdebase_dep marble plasma) - $(add_kdebase_dep solid) - media-libs/jasper - media-libs/lcms:0 - >=3Dmedia-libs/lensfun-0.2.5 - >=3Dmedia-libs/libkface-${PV} - >=3Dmedia-libs/libkgeomap-${PV} - media-libs/liblqr - >=3Dmedia-libs/libpgf-6.11.28 - media-libs/libpng - media-libs/tiff - virtual/jpeg - x11-libs/qt-gui[qt3support] - >=3Dsci-libs/clapack-3.2.1-r6 - || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] ) - addressbook? ( $(add_kdebase_dep kdepimlibs) ) - gphoto2? ( media-libs/libgphoto2 ) - mysql? ( virtual/mysql ) -" -RDEPEND=3D"${CDEPEND} - $(add_kdebase_dep kreadconfig) - media-plugins/kipi-plugins - video? ( - || ( - $(add_kdebase_dep mplayerthumbs) - $(add_kdebase_dep ffmpegthumbs) - ) - ) -" -DEPEND=3D"${CDEPEND} - dev-libs/boost - sys-devel/gettext - doc? ( app-doc/doxygen ) -" - -S=3D"${WORKDIR}/${MY_P}/core" - -RESTRICT=3Dtest -# bug 366505 - -src_prepare() { - # just to make absolutely sure - rm -rf "${WORKDIR}/${MY_P}/extra" || die - - # prepare the handbook - mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die - echo "add_subdirectory( digikam )" > doc/CMakeLists.txt - echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt - - # prepare the translations - mv "${WORKDIR}/${MY_P}/po" po || die - find po -name "*.po" -and -not -name "digikam.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 || die - - kde4-base_src_prepare - - if use handbook; then - echo "add_subdirectory( doc )" >> CMakeLists.txt - fi -} - -src_configure() { - local backend - - use semantic-desktop && backend=3D"Nepomuk" || backend=3D"None" - # LQR =3D only allows to choose between bundled/external - local mycmakeargs=3D( - -DFORCED_UNBUNDLE=3DON - -DWITH_LQR=3DON - -DWITH_LENSFUN=3DON - -DGWENVIEW_SEMANTICINFO_BACKEND=3D${backend} - $(cmake-utils_use_with addressbook KdepimLibs) - -DWITH_MarbleWidget=3DON - $(cmake-utils_use_enable gphoto2 GPHOTO2) - $(cmake-utils_use_with gphoto2) - $(cmake-utils_use_with semantic-desktop Soprano) - $(cmake-utils_use_enable themedesigner) - $(cmake-utils_use_enable thumbnails THUMBS_DB) - $(cmake-utils_use_enable mysql INTERNALMYSQL) - $(cmake-utils_use_enable debug DEBUG_MESSAGES) - ) - - kde4-base_src_configure -} - -src_compile() { - local mytargets=3D"all" - use doc && mytargets+=3D" doc" - - kde4-base_src_compile ${mytargets} -} - -src_install() { - kde4-base_src_install - - # someone had the great idea to install duplicate icons - einfo Removing duplicate icons - find "${ED}/usr/share/icons/oxygen" -name digikam.png -exec rm -v {} + - find "${ED}/usr/share/icons/oxygen" -name showfoto.png -exec rm -v {} + - - if use doc; then - # install the api documentation - insinto /usr/share/doc/${PF}/html - doins -r ${CMAKE_BUILD_DIR}/api/html/* - fi -} - -pkg_postinst() { - kde4-base_pkg_postinst - - if use doc; then - elog "The digikam api documentation has been installed at /usr/share/d= oc/${PF}/html" - fi -} diff --git a/media-gfx/digikam/digikam-2.4.1.ebuild b/media-gfx/digikam/d= igikam-2.4.1.ebuild deleted file mode 100644 index f4baa95..0000000 --- a/media-gfx/digikam/digikam-2.4.1.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.4.1.ebuil= d,v 1.4 2012/02/12 16:01:42 dilfridge Exp $ - -EAPI=3D4 - -KDE_LINGUAS=3D"af 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 sr@Latn ss sv ta te tg th tr tt uk uz uz@cyrillic ven = vi wa xh zh_CN zh_HK zh_TW zu" - -KDE_HANDBOOK=3D"optional" -CMAKE_MIN_VERSION=3D"2.8" -KDE_MINIMAL=3D"4.7" - -inherit kde4-base - -MY_P=3D"${PN}-${PV/_/-}" - -DESCRIPTION=3D"Digital photo management application for KDE" -HOMEPAGE=3D"http://www.digikam.org/" -SRC_URI=3D"mirror://sourceforge/${PN}/${MY_P}.tar.bz2" - -LICENSE=3D"GPL-2 - handbook? ( FDL-1.2 )" -KEYWORDS=3D"amd64 x86" -SLOT=3D"4" -IUSE=3D"addressbook debug doc gphoto2 mysql semantic-desktop themedesign= er +thumbnails video" - -CDEPEND=3D" - $(add_kdebase_dep kdelibs 'semantic-desktop=3D') - $(add_kdebase_dep libkdcraw) - $(add_kdebase_dep libkexiv2) - $(add_kdebase_dep libkipi) - $(add_kdebase_dep marble plasma) - $(add_kdebase_dep solid) - media-libs/jasper - media-libs/lcms:0 - >=3Dmedia-libs/lensfun-0.2.5 - >=3Dmedia-libs/libkface-${PV} - >=3Dmedia-libs/libkgeomap-${PV} - media-libs/liblqr - >=3Dmedia-libs/libpgf-6.11.28 - media-libs/libpng - media-libs/tiff - virtual/jpeg - x11-libs/qt-gui[qt3support] - >=3Dsci-libs/clapack-3.2.1-r6 - || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] ) - addressbook? ( $(add_kdebase_dep kdepimlibs) ) - gphoto2? ( media-libs/libgphoto2 ) - mysql? ( virtual/mysql ) -" -RDEPEND=3D"${CDEPEND} - $(add_kdebase_dep kreadconfig) - media-plugins/kipi-plugins - video? ( - || ( - $(add_kdebase_dep mplayerthumbs) - $(add_kdebase_dep ffmpegthumbs) - ) - ) -" -DEPEND=3D"${CDEPEND} - dev-libs/boost - sys-devel/gettext - doc? ( app-doc/doxygen ) -" - -S=3D"${WORKDIR}/${MY_P}/core" - -RESTRICT=3Dtest -# bug 366505 - -src_prepare() { - # just to make absolutely sure - rm -rf "${WORKDIR}/${MY_P}/extra" || die - - # prepare the handbook - mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die - echo "add_subdirectory( digikam )" > doc/CMakeLists.txt - echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt - - # prepare the translations - mv "${WORKDIR}/${MY_P}/po" po || die - find po -name "*.po" -and -not -name "digikam.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 || die - - kde4-base_src_prepare - - if use handbook; then - echo "add_subdirectory( doc )" >> CMakeLists.txt - fi -} - -src_configure() { - local backend - - use semantic-desktop && backend=3D"Nepomuk" || backend=3D"None" - # LQR =3D only allows to choose between bundled/external - local mycmakeargs=3D( - -DFORCED_UNBUNDLE=3DON - -DWITH_LQR=3DON - -DWITH_LENSFUN=3DON - -DGWENVIEW_SEMANTICINFO_BACKEND=3D${backend} - $(cmake-utils_use_with addressbook KdepimLibs) - -DWITH_MarbleWidget=3DON - $(cmake-utils_use_enable gphoto2 GPHOTO2) - $(cmake-utils_use_with gphoto2) - $(cmake-utils_use_with semantic-desktop Soprano) - $(cmake-utils_use_enable themedesigner) - $(cmake-utils_use_enable thumbnails THUMBS_DB) - $(cmake-utils_use_enable mysql INTERNALMYSQL) - $(cmake-utils_use_enable debug DEBUG_MESSAGES) - ) - - kde4-base_src_configure -} - -src_compile() { - local mytargets=3D"all" - use doc && mytargets+=3D" doc" - - kde4-base_src_compile ${mytargets} -} - -src_install() { - kde4-base_src_install - - if use doc; then - # install the api documentation - insinto /usr/share/doc/${PF}/html - doins -r ${CMAKE_BUILD_DIR}/api/html/* - fi -} - -pkg_postinst() { - kde4-base_pkg_postinst - - if use doc; then - elog "The digikam api documentation has been installed at /usr/share/d= oc/${PF}/html" - fi -}