diff options
| -rw-r--r-- | media-gfx/digikam/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/digikam/Manifest | 36 | ||||
| -rw-r--r-- | media-gfx/digikam/digikam-2.4.1.ebuild | 145 | ||||
| -rw-r--r-- | media-gfx/digikam/digikam-2.6.0.ebuild (renamed from media-gfx/digikam/digikam-2.6.0_beta3.ebuild) | 11 | ||||
| -rw-r--r-- | media-gfx/digikam/digikam-2.6.0_rc.ebuild | 153 |
5 files changed, 29 insertions, 324 deletions
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog index cc275fbef63f..efcde6c8b239 100644 --- a/media-gfx/digikam/ChangeLog +++ b/media-gfx/digikam/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/digikam # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.218 2012/05/13 13:56:11 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.219 2012/06/07 18:58:41 dilfridge Exp $ + +*digikam-2.6.0 (07 Jun 2012) + + 07 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org> -digikam-2.4.1.ebuild, + -digikam-2.6.0_beta3.ebuild, -digikam-2.6.0_rc.ebuild, +digikam-2.6.0.ebuild: + Version bump; remove old, beta, and rc *digikam-2.6.0_rc (13 May 2012) diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 06ac5bb45b80..e5b449fb2eac 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -3,30 +3,26 @@ Hash: SHA512 AUX digikam-2.5.0-boost148.patch 4133 RMD160 033b19386db95818d8f1aa7ac8b1384be8ec7169 SHA1 095ea8de1e353120f47ed41c0cd15a36d468efcb SHA256 e9adb199ca4955f64275481231c6761c32b84cdcc8bfab9ddebab6864f0f4a9f AUX digikam-2.5.0-libkipi.patch 2670 RMD160 a82bf1c2797279ac5f195a3f296ece677a838583 SHA1 23268e63dcc39f9e4452aff6639489f16d2c462c SHA256 7652e7854998b03a6047779361801dc63aa42c1f0221ef2b5c0f0a25abf1e651 -DIST digikam-2.4.1.tar.bz2 54531119 RMD160 2a07c061927e7cec7a0128a68e60f9d7c6d1e78b SHA1 2ec3a20225462d277d5f0c3aa17b1ecfbb61f98c SHA256 aca967a4cc5312923cb2340502eb10a571684c14cf63896a68a1796d0483de3b DIST digikam-2.5.0.tar.bz2 54976375 RMD160 4ff1b5fbc2cc4a8cb9994f7c7796086418dd43fb SHA1 6cadb838669d1bdcbd6abb677889f7d68d696383 SHA256 55292c79b41fd2c20ce0a821f388645436acb18b3b06b486747e17129114851a -DIST digikam-2.6.0-beta3.tar.bz2 55694232 RMD160 4337411d074a9f940270a8929293d5457cd283c9 SHA1 8ad5d6d482bbac582aaa2943c0d86272181e1565 SHA256 697ab7fdc0aff0a2a842df21608158f2abd1f7a4619cae9818749012267e6fec -DIST digikam-software-compilation-2.6.0-rc.tar.bz2 55840230 RMD160 0e774d665ef9a4c492767886e11fbb204ef03262 SHA1 966ceddb5768ca00bd7549f3380cd75cf2062945 SHA256 4d3013cae0645bfebad7701e23ad97ff288d7c623a7182828b9a4c87213cf7ac -EBUILD digikam-2.4.1.ebuild 3779 RMD160 ae3417da8b3dd7720e8099458b1ab5cf2835b1a2 SHA1 c29f3d4c178699a85a045ce7fdf485b8afe9ca60 SHA256 67177511b82432bb24096be539428a8a7b0160aa513c69039ed6388fde790dae +DIST digikam-2.6.0.tar.bz2 55362029 RMD160 69671481ab6699738892c6c91857b62d5cfe5abb SHA1 a7a9e4e342f118b603a11539c98a01c9970254df SHA256 411ceaa3a489d9c9a5566d43c167927a07fb08fb4f613b0dbf1dec65b95736df EBUILD digikam-2.5.0.ebuild 4199 RMD160 5837197480de236af70ae969125b7ebe37288538 SHA1 dace006c1a42909e87f432f63c26b6281be9d3a8 SHA256 20f95d31b85aae16e79ec8accbd73a1989625f269a6bc24098a61b3edba3f0e6 -EBUILD digikam-2.6.0_beta3.ebuild 4101 RMD160 58651a43737700a60249f76af739b72fcb619816 SHA1 3f010f82ecad0788485a4e7c3519e2a432efa628 SHA256 f095a084b1e9d6e42d408ce4cb095a77ad9cf31e7ede9e370b5b6b33db8bfd83 -EBUILD digikam-2.6.0_rc.ebuild 4145 RMD160 621ee2eb86db26c12c804353b01a87fc2f24a75e SHA1 c4123b9696bd75d8fbfbd1c24e03a5104cc6a9e9 SHA256 198cf001fc7682017e1dccfa59302addf631311b29274c156053ffbdd03e5d0e -MISC ChangeLog 36619 RMD160 c133752774c12e07948a3d25a0b940be2c2d6eba SHA1 ac16c1632c1bf91b4646cc0072b883ff34d49fb4 SHA256 1002be820c7c9c00b220305508df955b3479baade8abce6f71f95cfc81da1f09 +EBUILD digikam-2.6.0.ebuild 4100 RMD160 fd750f347e3b34d5454e94b65ff079889267bdfe SHA1 9e69be205658860e2cd57acd82bb255bf9e7e717 SHA256 f66eaaa31632c6db71d59c3b5c1f5bbcd9fef3eb698d8093b1d4191d077cb768 +MISC ChangeLog 36851 RMD160 a959c2a3106991ff1752decccb942683486f165d SHA1 61a9df60ea3f48f72ae3a930953eeb900d20ca49 SHA256 42dcd4e5ecc815b4c11d7141ee3a44fac57858ef7451a0402f1dbd4592d0bd28 MISC metadata.xml 648 RMD160 7694bc7a07e2b35c60e2ed22981007ba0680dd1f SHA1 15b78b8dee48c87b702a5705009b3eee46aa7ebd SHA256 fed8bb77a841bcbc558e06fbe5f729a616152051924fa17fed0e527237f09f8c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJPr72oAAoJEEb+UGWnxTyH0VcP+wa7MwMwyWDGaqjeZpV8YgUl -29bFlebjwi1v7v6jzQ5/vHzt7ktJZNJ5EsijtJzORmTBc6BiPveck6AyQ13Tvuat -eYCJ+1XN8Si2LdOTWmjwBkynswF+SwV67iamRyiJRVIOfHQydV/L3imSSZKjCthV -w6/CmhqRTF2lof13FyynJX9Xl6AqLlSuc0pheGFl5Gwli2RuJVOvbx0qFU/QH9mi -4blrIkxYiCl57K4WpFrybh0yzAyrmMtG8vRKVRYoPznVrIu2LdzwO9pSkHjlrCDv -MM5Z4qVlEdkViPQLP+CUFI8Z7Ij1MQFUTi1rQICnPF+TQc7117Qu4MWM+zPgDtp5 -5dtTUNy9pFe7FnGxnRVk6MW/bPUwXK+52Y/bvfpw+5levBk+VulCZTSl2zIbganz -7Jc/+IsLHdVMZvEovtvx0vLn8jN22gk8FJOoCYN0GoE6KvYqe200hPlHlrNoPsq+ -ASg+NGKmuPu0oDZOL8Ap460V0HXMbkWqJDOQwOBYnJ2IfX0QLPc64cjGMe5igWTx -2vR0zwMvQyAZlpnYU8pQ+AATOsDXtUd7mTEGtlQghZgoU+VlK7rcMYPNSY6/AkHe -KERA/K7elMFxNIx3LXepoySksfa4QWZmuh/7krtgvBXJwR8TGZrP+EEEE7YRRgMY -AVhoHf1AnEipYfPLMhjo -=Deto +iQIcBAEBCgAGBQJP0PosAAoJENwGBM22xffe34cP/iNRgE7bETKtSZk/LjpDMx53 +nASYKbMhtCrmUCTv3uxRSJhvI8LrEo1g7budZsjcHBhv3JfAM/uDWrrIqFdyRwlE +Y9qniB0sCTb8UKXulaj17avmZWA844UCOklbHbyNgqwN7QoiagdE/jzuN0KFnDqy +lEVbFhS/mm3u7Nz1LlzV0n8U6lH4hDMZVAg/6AOwaJp5HWKmh3B/8vIFWJSNfxBN +l5ZEbkKsXwjmey+O2QDtPLiToujUFr+BZTISPTX+LsLAdkZ+zBkbr39XZ0NLjmyf +5hDvKxhR4qbNTGY8+n6zSy/8ZGE5VyWNPAPxbDL72c+R2/5jS2NsxumFiahur7M5 +ML66hZOPgSZ41o5t6hws3rY6mwfg5M1oKXvY6jyOgnZlGZNB8j3INt1WgZzz97dF +iHlSb6Dw8BAD+RJ00TPpnAxFb8VJ0CGPyukZV1FMcU+/AxAjJ2NqMXK623LOtOw7 +3x9pCvx0LvbqFAj1fZAhMgPuH61SjN/i0hBUZgwjtaCCLoNx9eclFaLrRgYC0qBD +8/O9xs7UbmN1WrXjaPkC+yYKNO30DS21xvUF/tIn2LO8f9EGaOrYBfUuYmcWfW9p +RwtjeCvARDnA6ijUhJozd4FzOp+i4bMLNtGfmP3BIBft4zdDwnksOROwxOagEePc +liDrbliWjKDpixwV3m6v +=yYEf -----END PGP SIGNATURE----- diff --git a/media-gfx/digikam/digikam-2.4.1.ebuild b/media-gfx/digikam/digikam-2.4.1.ebuild deleted file mode 100644 index f4baa95f53d3..000000000000 --- 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.ebuild,v 1.4 2012/02/12 16:01:42 dilfridge Exp $ - -EAPI=4 - -KDE_LINGUAS="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="optional" -CMAKE_MIN_VERSION="2.8" -KDE_MINIMAL="4.7" - -inherit kde4-base - -MY_P="${PN}-${PV/_/-}" - -DESCRIPTION="Digital photo management application for KDE" -HOMEPAGE="http://www.digikam.org/" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" - -LICENSE="GPL-2 - handbook? ( FDL-1.2 )" -KEYWORDS="amd64 x86" -SLOT="4" -IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video" - -CDEPEND=" - $(add_kdebase_dep kdelibs 'semantic-desktop=') - $(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 - >=media-libs/lensfun-0.2.5 - >=media-libs/libkface-${PV} - >=media-libs/libkgeomap-${PV} - media-libs/liblqr - >=media-libs/libpgf-6.11.28 - media-libs/libpng - media-libs/tiff - virtual/jpeg - x11-libs/qt-gui[qt3support] - >=sci-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="${CDEPEND} - $(add_kdebase_dep kreadconfig) - media-plugins/kipi-plugins - video? ( - || ( - $(add_kdebase_dep mplayerthumbs) - $(add_kdebase_dep ffmpegthumbs) - ) - ) -" -DEPEND="${CDEPEND} - dev-libs/boost - sys-devel/gettext - doc? ( app-doc/doxygen ) -" - -S="${WORKDIR}/${MY_P}/core" - -RESTRICT=test -# 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="Nepomuk" || backend="None" - # LQR = only allows to choose between bundled/external - local mycmakeargs=( - -DFORCED_UNBUNDLE=ON - -DWITH_LQR=ON - -DWITH_LENSFUN=ON - -DGWENVIEW_SEMANTICINFO_BACKEND=${backend} - $(cmake-utils_use_with addressbook KdepimLibs) - -DWITH_MarbleWidget=ON - $(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="all" - use doc && mytargets+=" 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/doc/${PF}/html" - fi -} diff --git a/media-gfx/digikam/digikam-2.6.0_beta3.ebuild b/media-gfx/digikam/digikam-2.6.0.ebuild index 381434432c0f..dddeed27e021 100644 --- a/media-gfx/digikam/digikam-2.6.0_beta3.ebuild +++ b/media-gfx/digikam/digikam-2.6.0.ebuild @@ -1,6 +1,6 @@ # 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.6.0_beta3.ebuild,v 1.1 2012/04/08 19:54:28 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.6.0.ebuild,v 1.1 2012/06/07 18:58:41 dilfridge Exp $ EAPI=4 @@ -16,7 +16,8 @@ KDE_DOC_DIRS="doc-digikam doc-showfoto" inherit kde4-base -MY_P="${PN}-${PV/_/-}" +MY_PV=${PV/_/-} +MY_P=${PN}-${MY_PV} DESCRIPTION="Digital photo management application for KDE" HOMEPAGE="http://www.digikam.org/" @@ -24,7 +25,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" LICENSE="GPL-2 handbook? ( FDL-1.2 )" -KEYWORDS="" +KEYWORDS="~amd64 ~x86" SLOT="4" IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video" @@ -37,16 +38,16 @@ CDEPEND=" $(add_kdebase_dep solid) media-libs/jasper media-libs/lcms:0 - >=media-libs/lensfun-0.2.5 + media-libs/lensfun media-libs/libkface media-libs/libkgeomap media-libs/liblqr >=media-libs/libpgf-6.11.28 media-libs/libpng media-libs/tiff + sci-libs/clapack virtual/jpeg x11-libs/qt-gui[qt3support] - >=sci-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 ) diff --git a/media-gfx/digikam/digikam-2.6.0_rc.ebuild b/media-gfx/digikam/digikam-2.6.0_rc.ebuild deleted file mode 100644 index 51489dba16af..000000000000 --- a/media-gfx/digikam/digikam-2.6.0_rc.ebuild +++ /dev/null @@ -1,153 +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.6.0_rc.ebuild,v 1.1 2012/05/13 13:56:11 dilfridge Exp $ - -EAPI=4 - -KDE_LINGUAS="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="optional" -CMAKE_MIN_VERSION="2.8" -KDE_MINIMAL="4.8" - -KDE_DOC_DIRS="doc-digikam doc-showfoto" - -inherit kde4-base - -MY_PN=digikam-software-compilation -MY_PV=${PV/_/-} -MY_P=${MY_PN}-${MY_PV} - -DESCRIPTION="Digital photo management application for KDE" -HOMEPAGE="http://www.digikam.org/" -SRC_URI="mirror://sourceforge/${PN}/${PN}/${MY_PV}/${MY_P}.tar.bz2" - -LICENSE="GPL-2 - handbook? ( FDL-1.2 )" -KEYWORDS="" -SLOT="4" -IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video" - -CDEPEND=" - $(add_kdebase_dep kdelibs 'semantic-desktop=') - $(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 - media-libs/lensfun - media-libs/libkface - media-libs/libkgeomap - media-libs/liblqr - >=media-libs/libpgf-6.11.28 - media-libs/libpng - media-libs/tiff - sci-libs/clapack - virtual/jpeg - x11-libs/qt-gui[qt3support] - || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] ) - addressbook? ( $(add_kdebase_dep kdepimlibs) ) - gphoto2? ( media-libs/libgphoto2 ) - mysql? ( virtual/mysql ) -" -RDEPEND="${CDEPEND} - $(add_kdebase_dep kreadconfig) - media-plugins/kipi-plugins - video? ( - || ( - $(add_kdebase_dep mplayerthumbs) - $(add_kdebase_dep ffmpegthumbs) - ) - ) -" -DEPEND="${CDEPEND} - dev-libs/boost - sys-devel/gettext - doc? ( app-doc/doxygen ) -" - -S="${WORKDIR}/${MY_P}/core" - -RESTRICT=test -# bug 366505 - -src_prepare() { - # just to make absolutely sure - rm -rf "${WORKDIR}/${MY_P}/extra" || die - - # prepare the handbook - mkdir doc-digikam doc-showfoto || die - echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die - mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die - echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die - mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die - sed -i -e 's:../digikam/:../../doc-digikam/en/:g' doc-showfoto/en/index.docbook || die - - # 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-digikam )" >> CMakeLists.txt - echo "add_subdirectory( doc-showfoto )" >> CMakeLists.txt - fi -} - -src_configure() { - local backend - - use semantic-desktop && backend="Nepomuk" || backend="None" - # LQR = only allows to choose between bundled/external - local mycmakeargs=( - -DFORCED_UNBUNDLE=ON - -DWITH_LQR=ON - -DWITH_LENSFUN=ON - -DGWENVIEW_SEMANTICINFO_BACKEND=${backend} - $(cmake-utils_use_with addressbook KdepimLibs) - -DWITH_MarbleWidget=ON - $(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="all" - use doc && mytargets+=" 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/doc/${PF}/html" - fi -} |