* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/
@ 2011-02-28 23:10 Andreas K. Huettel
0 siblings, 0 replies; 17+ messages in thread
From: Andreas K. Huettel @ 2011-02-28 23:10 UTC (permalink / raw
To: gentoo-commits
commit: 31b531a14c1704cd17fc52bec06ac84da1610608
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Mon Feb 28 23:11:41 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 23:11:41 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=31b531a1
[media-gfx/digikam] Version bump
(Portage version: 2.1.9.41/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
media-gfx/digikam/ChangeLog | 6 +
media-gfx/digikam/Manifest | 34 ++++---
media-gfx/digikam/digikam-2.0.0_beta3.ebuild | 135 ++++++++++++++++++++++++++
3 files changed, 159 insertions(+), 16 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index ee34c1d..5dfd6a9 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*digikam-2.0.0_beta3 (28 Feb 2011)
+
+ 28 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ +digikam-2.0.0_beta3.ebuild:
+ Version bump
+
*digikam-1.9.0 (28 Feb 2011)
28 Feb 2011; Andreas K. Huettel <dilfridge@gentoo.org>
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 0662891..502bcaf 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
AUX digikam-1.1.0-libpgf.patch 8996 RMD160 4f1a7ad7b28c43b3fe2e454eb3351f27a14bde6f SHA1 fd2b98e23c31d880a2a32f28161f279abef82c22 SHA256 f2001099ee5538a31a9660c223e59a25a19eb7c36a191831b849e1b81c58856d
AUX digikam-1.1.0-libpng14.patch 1580 RMD160 769e9bf4030d795349cb260854e26c189471ccbc SHA1 9b3123dad7bd7530db6833296dc1de7ec240fd54 SHA256 0ae5e279aedc80857cb27ace7d1609b6cf632853513445896b88a7365b763fb9
@@ -22,27 +22,29 @@ DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880
DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
DIST digikam-2.0.0-beta2.tar.bz2 23685947 RMD160 0370c304af9dfcc380d97747f698ab449e0d0beb SHA1 dbc62eed97c54dbdfff97690d4eb218d361e0d25 SHA256 15f49e18fefdf7bcce8b31bb77b4fe31368f16d88c039842c58e7cbafa58fd49
+DIST digikam-2.0.0-beta3.tar.bz2 24063835 RMD160 61871d8f1f28acd7f3b83f261a94715d97bf71ea SHA1 7688ef4eec77b55e36ecd8f55d92635c36f38349 SHA256 60c9f050b07a787e1512173b7b871dbf9babc730804f98829dae53229e16b97e
DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
EBUILD digikam-1.2.0-r4.ebuild 3215 RMD160 8b65234982a07cbca031e762cca9ad9fca0af112 SHA1 ed204cc640716af1998afe46f6cb2c3395da31ba SHA256 bba559b09bdb15fa23ffc390e70c26cb111143cca6bfc280e5c5240f1052aac1
EBUILD digikam-1.8.0.ebuild 3233 RMD160 9d246c104d4705c7be47a7496da68f663ca5012c SHA1 d5033cb9d1f909a3b0516e92bff9c5e596fad486 SHA256 cd3a989f75296645049899f45d9f6a5dc96695c44615561088b8e9d077b9e87d
EBUILD digikam-1.9.0.ebuild 3240 RMD160 7070312f1310e0c79702c08f404c97192a826130 SHA1 b79572a1dc6a95f6735091fdd74a8cd204a4a430 SHA256 a39706489d6a16212de05a90563f5681e6634e5070f62bf6c740f167d8919aa7
EBUILD digikam-2.0.0_beta2.ebuild 3334 RMD160 a0297ac43f4aff1d038d88236c2cfc0389fcdde4 SHA1 9c155bafa5736bfff2e150450771e26501ec82d0 SHA256 e2e1103efd5454be2ec03af814460e8578cc6a9bdd033612a15c79a9e68e665f
-MISC ChangeLog 8829 RMD160 5261883e23ec76c6901d23db96938426e9acacca SHA1 492849aa9478d11ed836f8bd2f41504e20913436 SHA256 ef80980c265cc13c5baab85336afa2c11514589f1926f6502942aafe68a657ed
+EBUILD digikam-2.0.0_beta3.ebuild 3334 RMD160 8611636f62192c2eaa4ce7a338e66bd50985315d SHA1 787a9098b3682828267ffef72a421c858b266c1f SHA256 9a29623a16ef1071a33473e9b951b391182ed95e032046ec43de51384514d9f5
+MISC ChangeLog 8969 RMD160 16a5788bc1e9bd154abb686410240a6b7dad687e SHA1 12f21833715fe8a1d259411f948e66c5c8f70900 SHA256 b9e162a75fae2ad09638307a4fe15c3927651b9bd94c718cefe44744ea4064b8
MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJNa+s7AAoJEEb+UGWnxTyHSbQP/3o9M5BxueUI3RisYbQMQ7Pe
-pTpZdfmzVcvPL24H/ymMZorzTtjt1Jceeo6l0cfIkCP1cl4MVd2hh7j7KceCzv5z
-uuWKPMnWUe6BRzDF4bMFL2TynbpwWQjGf/gg6uiyZkHvPVVCq4rztBDzS9nMKehy
-db581z6utmDNSH/xXABt91AmL1sB9cE5nwI74nr9WDiG7Jc/KYT6e6RGpswHeYWg
-6K3BENup9G0IA5TBFOv7ky6haN3leKjd599cX3iraMUQpyMSx7YPRIBP6erfh8+G
-zh9BNBsbiASvHNaw6Oq6DppJqaYSWC3hVZArZyiDE1JdxipETu0VBJ8vAQg5n5Sl
-DsHUTCPZ1kBiXURJQnaxUuXEvDzhFy3IEX6OluFOdEhFbIlhCmJpmNVtpAkek/GG
-2v4vUWHJmR1qVA3GHSkhzGqUBWgjlJjjqeEhmdzvK/OocWk+m0cc52PwTVjguVcR
-zyt8b+ZjEjSkS9Qop/+abPX/Etyw5p3yYAUoSDcRW8HANXCsWYUUY0zAen7QlWyC
-C43qMIQyYINT8ZlKZ7RQKUvO091qRYXf28oAC5jE/7nnEzCd4956vtKSt95Q6t/C
-M1BhWJO/JlXKVUZjO/suxscTyLadHL/MxYcMy/MpmAsAY1M9D8+tIZgOBPbOcQdG
-jasfRZbXPVlSwfXWDTLy
-=I/9u
+iQIcBAEBAgAGBQJNbCutAAoJENwGBM22xffeKhAP/AlKiIxuEDAKBAGz3kLZ7ydp
+M5JXvUU+4auGfNdLl5vq7eFUPopapweS6ltCOlU6H2e41gCaOUiEpHAzTBRGDWxd
+1bMdF0bxaHfPiUXQ2FfX72HgTj05shWqr/S+rBmFjs/o9x3no7G9K9QdFg+lFvrq
+F6Cf4kxWLLBbefziS6vW64EIJ/VzAmQISrlsLK8nyFe5/Z15WNKvCXQpNd4zm+xW
+h9kpJXkGwh1asRqQTjdTphQewWsKmBBBRbul1pCJf0gCjceejtWHa28bbBPMBKc4
+zv+fkgY900r14hjHNNSkiy8S9FZinIA89hhnM71G7qelljUhF0I9ELmeJ0n93M1i
+3w99208fpXoCqoCn3Amv7Mw9dIFjOizz6htFZ7jipAwXn3syfgI3qPYDfrPNkebE
+hrb1PKJT3nnpK8cTKFS3fgGiVTdtFeV4+kwifw2EGVHoBTFdu5CSt4qlnXUnOFcX
+WzUZTiAukfE2ezQ++pKFYPLbkkuxdy9Ov3GVtI6VVKwMGQWqprtM4ib4AR1NQmNm
+J+4Of6H741Ai1714CwQgOHQEOufs04ix2GvpHqNtgO+TDSRj0YJsxyBKOVG8euok
+O0mNuxDPLxF9DTkZFR9dWGx3H6brj7G1DIak0HLG1fmP3YYNvkpKOxOA7qGI3I9h
+M2Uv4U95E1mUhjNZG3mE
+=QiqD
-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.0.0_beta3.ebuild b/media-gfx/digikam/digikam-2.0.0_beta3.ebuild
new file mode 100644
index 0000000..6b9d299
--- /dev/null
+++ b/media-gfx/digikam/digikam-2.0.0_beta3.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.6.0.ebuild,v 1.1 2010/11/25 20:30:29 dilfridge Exp $
+
+EAPI=3
+
+if [ "${PV}" != "9999" ]; then
+ KDE_LINGUAS=""
+# KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
+# ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
+else
+ KMNAME="extragear/graphics"
+fi
+
+CMAKE_MIN_VERSION=2.8
+
+KDE_MINIMAL="4.6"
+KDEGRAPHICS_MINIMAL="4.6.27"
+
+inherit kde4-base
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="A digital photo management application for KDE."
+HOMEPAGE="http://www.digikam.org/"
+[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
+ handbook? ( mirror://gentoo/${PN}-doc-1.4.0.tar.bz2 )"
+
+LICENSE="GPL-2
+ handbook? ( FDL-1.2 )"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="addressbook debug doc gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
+
+CDEPEND="
+ $(add_kdebase_dep kdelibs semantic-desktop)
+ $(add_kdebase_dep marble plasma)
+ $(add_kdebase_dep libkipi)
+ $(add_kdebase_dep libkexiv2)
+ >=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL}
+ >=media-libs/libkface-${PV}
+ >=media-libs/libkmap-${PV}
+ $(add_kdebase_dep solid)
+ media-libs/jasper
+ virtual/jpeg
+ media-libs/lcms:0
+ >=media-libs/lensfun-0.2.5
+ media-libs/liblqr
+ media-libs/libpng
+ media-libs/tiff
+ media-libs/libpgf
+ >=media-plugins/kipi-plugins-1.2.0-r1
+ >=sci-libs/clapack-3.2.1-r3
+ virtual/mysql
+ x11-libs/qt-gui[qt3support]
+ || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
+ addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
+ gphoto2? ( media-libs/libgphoto2 )
+"
+RDEPEND="${CDEPEND}
+ >=kde-base/kreadconfig-${KDE_MINIMAL}
+ video? (
+ || (
+ >=kde-base/mplayerthumbs-${KDE_MINIMAL}
+ >=kde-base/ffmpegthumbs-${KDE_MINIMAL}
+ )
+ )
+"
+DEPEND="${CDEPEND}
+ sys-devel/gettext
+ doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${MY_P}/core"
+
+PATCHES=( "${FILESDIR}/${PN}"-2.0.0_beta1-docs.patch )
+
+src_prepare() {
+ # just to make absolutely sure
+ rm -rf "${WORKDIR}/${MY_P}/extra" || die
+
+ if use handbook; then
+ mv "${WORKDIR}/${PN}"-1.4.0/* "${S}/" || die
+ fi
+ kde4-base_src_prepare
+ if use handbook; then
+ echo "add_subdirectory( doc )" >> CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local backend
+
+ use semantic-desktop && backend="Nepomuk" || backend="None"
+ # LQR = only allows to choose between bundled/external
+ mycmakeargs=(
+ -DFORCED_UNBUNDLE=ON
+ -DWITH_LQR=ON
+ -DWITH_LENSFUN=ON
+ -DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
+ $(cmake-utils_use_with addressbook KdepimLibs)
+ $(cmake-utils_use_build doc)
+ -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)
+ )
+
+ kde4-base_src_configure
+}
+
+src_install() {
+ kde4-base_src_install
+
+ if use doc; then
+ # install the api documentation
+ dodir /usr/share/doc/${PF}/html || die
+ insinto /usr/share/doc/${PF}/html
+ doins -r ${CMAKE_BUILD_DIR}/api/html/* || die
+ fi
+
+ if use handbook; then
+ dodoc readme-handbook.txt || die
+ 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
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/
@ 2011-03-01 20:22 Andreas K. Huettel
0 siblings, 0 replies; 17+ messages in thread
From: Andreas K. Huettel @ 2011-03-01 20:22 UTC (permalink / raw
To: gentoo-commits
commit: 6ef69082d11d74f5a97dd1f588e3cd7c9dbcff11
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Tue Mar 1 07:25:43 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Mar 1 07:25:43 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=6ef69082
[media-gfx/digikam] Readd ~ppc in line with digikam-1.9.0
(Portage version: 2.1.9.41/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)
---
media-gfx/digikam/ChangeLog | 4 +++
media-gfx/digikam/Manifest | 32 +++++++++++++-------------
media-gfx/digikam/digikam-2.0.0_beta2.ebuild | 2 +-
media-gfx/digikam/digikam-2.0.0_beta3.ebuild | 2 +-
4 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 2d9a7df..b13c129 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -3,6 +3,10 @@
# $Header: $
01 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ digikam-2.0.0_beta2.ebuild, digikam-2.0.0_beta3.ebuild:
+ Readd ~ppc in line with digikam-1.9.0
+
+ 01 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
digikam-1.2.0-r4.ebuild, digikam-1.8.0.ebuild,
+files/digikam-1.8.0-gcc46.patch, digikam-1.9.0.ebuild:
Resync with main tree
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 8a88a23..da3d180 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -28,24 +28,24 @@ DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf13
EBUILD digikam-1.2.0-r4.ebuild 3241 RMD160 97240d9bf66f91276583380abb44abcca32aef53 SHA1 541cb89174e630ede2a012f75576b1e66a7e5834 SHA256 7b99de04c49c27afc4047b49eb88558d34ab83cdddf272d3a282313f79e88c48
EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
EBUILD digikam-1.9.0.ebuild 3245 RMD160 7595b6ce1967bafa99dd8ecf19257838aef23753 SHA1 6c144376c2ed7058111505fc265fcee15f6f5462 SHA256 a410fe8542a23f6f1a47b6fac8e4ec0980f84518da06c90f2c9532292818fd06
-EBUILD digikam-2.0.0_beta2.ebuild 3334 RMD160 a0297ac43f4aff1d038d88236c2cfc0389fcdde4 SHA1 9c155bafa5736bfff2e150450771e26501ec82d0 SHA256 e2e1103efd5454be2ec03af814460e8578cc6a9bdd033612a15c79a9e68e665f
-EBUILD digikam-2.0.0_beta3.ebuild 3334 RMD160 8611636f62192c2eaa4ce7a338e66bd50985315d SHA1 787a9098b3682828267ffef72a421c858b266c1f SHA256 9a29623a16ef1071a33473e9b951b391182ed95e032046ec43de51384514d9f5
-MISC ChangeLog 9158 RMD160 d241792c1fdfcb85afbd04053c8cce8600acaa92 SHA1 8c8136a08fdb7c49ced677a164a8c135342ecf6c SHA256 9a117017b2d87825f2b8cb2d0a257f25ba1a58fddd6987b34f3c3ec3cc02ccc8
+EBUILD digikam-2.0.0_beta2.ebuild 3339 RMD160 b930008d6fe94d757ecd23eb80949114e62b835b SHA1 10351caff0808bee413c99160b227cffd1b84473 SHA256 23872b2b307c1021af88bf994bcc0553eb01e330585d706067dfe2b8dea56d3e
+EBUILD digikam-2.0.0_beta3.ebuild 3339 RMD160 e931dff9b3dc632d586c27323c1b6ae96cfa74d8 SHA1 78481f6fb42060e4d240c568069e4fb48afc3bdb SHA256 311d6f8f1b22c8b40da470c07e1813db3c6cbeab64ded51c3a37a46dda747e60
+MISC ChangeLog 9314 RMD160 fb78bdac49ed92cffa01506c6171562b9de66579 SHA1 1805d0e98574783a730c1182921c45f7da6957d0 SHA256 71fe0c16d64514519048b5821742d86b985360809f8969e9176cfc45cd1551a8
MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBAgAGBQJNbJ8gAAoJENwGBM22xffeQUsP/jt+LOgxXqBzOcT5CGYOu43B
-lXdIGIEEwD5P8e0q2iQZ94v19HDGb4dVybc4DZ3pGQD3bn9JAeon/7NNKRBmepap
-1mZFcty+r75cuCbrR7bVmykQYDk0UKz+1r/npkJ4dzt8+LOxBBG8SfKRH16Wjx+w
-DW464d3No3iWsEunYxrIu9bODlLvgQhd7/oeEWZYgGTd3Py2Cc3GzYUZiAgpgZOr
-sMn+G061YKiOydpSWvIz4HeNLXVE+QD6K9kzdC1PpU1/JQWzNsH9HH2z9rnWfo7B
-TyvFxq6ngyBYGJr4lu+dpgPz6tr/5SK7DUVIoK2cI4VWynfLMg3D27WkEyotJQJ1
-A8ZQ1/oLTq7BBoJQpxNGla1cr4EmC9MyY5MCValBAsiLB85S8saxz2mDu+DAJ/yg
-TR2s7DpeDVJzWB6op+EbDhurJW/zn1XeNXyNQDLcIAeHDc1TePNhGOgr/F2DnY+J
-kAsZS+Z8Tq2M7tgjksptscc0UfHpLx2Yijqs7mJOVVMSOHjYFiqqSz7SZEllhsl4
-lShlYEaNtF1c9eeNunCzO5wA2eD5eyY6IEkGLlto/UjA7or4g8OAZ56CB/sEh/kd
-GwTl7KlWxvwJAUAzt8tMU31v1ph7NzoFR4MtS6SqOB0AJteX7ZSsA5lLl+pptWV9
-zGcP8XMME2vdW7Zvx2YJ
-=0rel
+iQIbBAEBAgAGBQJNbJ93AAoJENwGBM22xffeUrYP+O1aWG877uDUf55l7Xc4/rq/
+lEk+E6NNdmo4aeg0Wf+d+vfRijqSVVJX3p1ur6uKcdvJm3QrlsEu1zsdn09Zm2e1
+sr7NWhRHqfVg7Z2aXQzkIyaXG2Xgm16XYxHe5miGT9Gv4l+oBckd6G3VV+In3eCL
+yFLWVkx563ECm4XbVR/Taawr2ofhaUsudDt7P/S83yFc/t3OAJoQJ+Dqq6WgKr4e
+iGP12xaxSgHBDVgONObrfPs30bpfS2FomnEHsF929HvGJRTI1QW3+FgP0D4ft2HC
+/jkjig3S+NoHGw3tuF0hQXm5vSKeXhNw8b27cwFxOTu44s5nAXp9YGHtHTTkecQT
+8WxrrD1pEJv8Jf1obS1zeo2VUMinJuUidz8VvKfMTgB202d7Wnznb0PO4c1mHdi6
+9omiaCVjNfTvCAwTVc0U4XxXO3v4ds3TRg82jcDY0+hk9LeVkKH3myhc2kZRD7VZ
+Yo+i8eeg4TLcVNxkF054u53nc5vpgyG5VIhN95KcP2Xv4dRG+/kBQUJko2the2FZ
+Q+/4Jd3KoELHNc5vnExnKkMEAVjSvIZGfLXgTd0Pjk+h800L0OivTTPUVdhpsGKO
+jmU0jHssV815bBd8P3fWaGgpFTgr6KC3CSBTnzZhUDD04YY+As3G8lZu6w4m+3JX
+4EHm73ti9zMvxaSkMag=
+=Q3tZ
-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.0.0_beta2.ebuild b/media-gfx/digikam/digikam-2.0.0_beta2.ebuild
index d6b400c..d49dad4 100644
--- a/media-gfx/digikam/digikam-2.0.0_beta2.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0_beta2.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="http://www.digikam.org/"
LICENSE="GPL-2
handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
SLOT="4"
IUSE="addressbook debug doc gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
diff --git a/media-gfx/digikam/digikam-2.0.0_beta3.ebuild b/media-gfx/digikam/digikam-2.0.0_beta3.ebuild
index 6b9d299..23d1f34 100644
--- a/media-gfx/digikam/digikam-2.0.0_beta3.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0_beta3.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="http://www.digikam.org/"
LICENSE="GPL-2
handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
SLOT="4"
IUSE="addressbook debug doc gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/
@ 2011-04-11 22:14 Andreas K. Huettel
0 siblings, 0 replies; 17+ messages in thread
From: Andreas K. Huettel @ 2011-04-11 22:14 UTC (permalink / raw
To: gentoo-commits
commit: b061a85ee9edfa0b092fb423dbfb1ebfa419165d
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Mon Apr 11 22:14:22 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 22:14:35 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=b061a85e
[media-gfx/digikam] Allow sci-libs/lapack-atlas as alternative to clapack
(Portage version: 2.1.9.45/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)
---
media-gfx/digikam/ChangeLog | 4 +++
media-gfx/digikam/Manifest | 30 +++++++++++++-------------
media-gfx/digikam/digikam-2.0.0_beta4.ebuild | 2 +-
3 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 1152e15..cb7f9bb 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 11 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ digikam-2.0.0_beta4.ebuild:
+ Allow sci-libs/lapack-atlas as alternative to clapack
+
*digikam-2.0.0_beta4 (01 Apr 2011)
01 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index d89bb83..c2e0d31 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -32,23 +32,23 @@ EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742
EBUILD digikam-1.9.0.ebuild 3245 RMD160 7595b6ce1967bafa99dd8ecf19257838aef23753 SHA1 6c144376c2ed7058111505fc265fcee15f6f5462 SHA256 a410fe8542a23f6f1a47b6fac8e4ec0980f84518da06c90f2c9532292818fd06
EBUILD digikam-2.0.0_beta2.ebuild 3339 RMD160 b930008d6fe94d757ecd23eb80949114e62b835b SHA1 10351caff0808bee413c99160b227cffd1b84473 SHA256 23872b2b307c1021af88bf994bcc0553eb01e330585d706067dfe2b8dea56d3e
EBUILD digikam-2.0.0_beta3.ebuild 3339 RMD160 e931dff9b3dc632d586c27323c1b6ae96cfa74d8 SHA1 78481f6fb42060e4d240c568069e4fb48afc3bdb SHA256 311d6f8f1b22c8b40da470c07e1813db3c6cbeab64ded51c3a37a46dda747e60
-EBUILD digikam-2.0.0_beta4.ebuild 3304 RMD160 95cbc46cf0a56f31491130160b9908f08f34387a SHA1 90f3a2a7760e4d7bfc1d6dbd3853960179032f22 SHA256 1f5f2aa311fcb9d7243a54cdf7fe01ad5548a33d7c1bcb98f057c4de1a082143
-MISC ChangeLog 9493 RMD160 259ef9439a426cd9d3228c25ecc83128ffe3ef74 SHA1 cb6db46747ec5cd4b3a770993c408eeb187f43f5 SHA256 5a4166ace25d0c40f401f03cd831b6b315e550c23d39df245a6abadd3544e0d9
+EBUILD digikam-2.0.0_beta4.ebuild 3333 RMD160 f233ebb7788ec8caa3a2bca7d341f635d685b1da SHA1 806b4fc1347782c1f59c3d57f68eb83396389460 SHA256 1968e6f68542a68c796307a67a0804349f9b46123b6b7369c59a8e5496189ebd
+MISC ChangeLog 9637 RMD160 740296efcdc4b3c64822bc5d2ddd6d858f3f7368 SHA1 f640f0ef752043bf61c7a0b09bc5f639e2873f41 SHA256 c2ce99b71d15e1f9588d4225d66577d3dd406dfbfc346dc2eb3d4d7ea58b612c
MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJNlmXaAAoJENwGBM22xffePCAQAIjJXWHnZ9DF/UPtPhmUmy0R
-KrQ1SkttTQfB+4MUICdewu/z6p41gKkP4tP5mCGqQaDEYbHT6OmOKP0o894wDNL6
-JA5AODmvBU4bfto87kzWRYx4rC1PKm3JKWg9LqVox5hA59KF/C2iQg/Oi95+sBA5
-+lAbmVMaJGTq+++nbITRB8tzQsRpKR9dTLk5hZIvjPEd1zNpBWviKm+zP0nrh+Tn
-PIwm112/Z9I298k9LFLDCbyiIVaMu69Wg9Ba8Fudy/1l0vXHixOR6OSr9+AE6K8n
-aD+vwGyrh4S22uVXIZP6t2OzhLI9rxf0ul4CFBr3pdNVu16FBIha4Cay4mIcOLcy
-nQe9Keod73yAQOpRda4/Kr+eME0aUZPNWS9uD3EeZwUcmodtzHLWgwscoOBnC3X3
-xyIt9jKyDuOmxBljLafJpRbzsIKRcYsa2rFaSZCRQ7fZLU7rzhhtWivB6E16E5Yh
-AIsrMDcgZhU2lxhowN6ysccIVUZz2FhfVHyJnIjj/W60vnbM2wE2Y8Z49TGTrAfa
-033EXaNPauslRIJkFrzz4zeNwRhpoG27RiYZQlg7btZBJ/MtvJcGiv4NcjSboEYk
-3yL2MfEUBcT62SHcc+1D0+cZH4xY5IGw1kpLxTo5ivhCLFfv5Byn/ooLWr4tMX6i
-EBTc+Rk2LiyeEiHxpdV2
-=CJ+Y
+iQIcBAEBCgAGBQJNo30+AAoJENwGBM22xffeiSUP/0eDP6t/FNO0g2LvbzVRtjqQ
+ASQnWcyQZC40pZfJzRv7dZ5OLMpYdmmZ6ndIAh7kKi35+XPtU5yj9Lco6Q/8UlNg
+4/xHdchQA7leHsIpskvDLfp2EDyqyNZ2phG1gTk6sdGQCTHr8HJ+VMc5Q815ozau
+QVJcSr7YQTHrFehiEZ3H9aCtiNZzVF1lzVh8KTnrw6jwrOxPnvOkqcFODavcCO9Y
+r+ygj9Vr4V4b8rwRPw79wiU5caPwXhQe9xthls6sO8b1IMB3YKx6ODdhN4M2TmdD
+0J8qylUiO+gYGOQ70+QGeqqFFgtYXNE9sYUKURp1FTYdA+tGwNYg1IwKLsHME+c6
+LEnxcvfIrfZ+oBf8DgeXUWeAUCc74Hc6JymYCnkpFsk4z/lnZAwy0YzrYb4dS9E5
+mfTF45J538O7KvJklOGK66ZQqP16zBEqz3RHBojXsqarTCS55fDOmHsnPH2hFXov
+NOBQOmSorOnnw9OMwmSvCa1T0d0w6LlK+IbxvzuDwNW7kOfFkuMY514hMQSZQJo+
+YEJQaUptL5/ex+eDQoHcVb4iIrDFulxFKR8eeUCHFLQzO11lxVmSwmnovp+m9pMN
+WuCQqh2V0bFRj9+LLEiIQQvJn/Ubbi6QF0eeeB43Mb8Y02jCbz0GxSKf5vxTIaXT
+HXbgOv6BPXzbu7zLkLeF
+=Gm9n
-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.0.0_beta4.ebuild b/media-gfx/digikam/digikam-2.0.0_beta4.ebuild
index 0c53724..f03da3a 100644
--- a/media-gfx/digikam/digikam-2.0.0_beta4.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0_beta4.ebuild
@@ -49,7 +49,7 @@ CDEPEND="
media-libs/tiff
media-libs/libpgf
>=media-plugins/kipi-plugins-1.2.0-r1
- >=sci-libs/clapack-3.2.1-r3
+ || ( >=sci-libs/clapack-3.2.1-r3 sci-libs/lapack-atlas )
virtual/mysql
x11-libs/qt-gui[qt3support]
|| ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/
@ 2011-05-11 20:46 Andreas K. Huettel
0 siblings, 0 replies; 17+ messages in thread
From: Andreas K. Huettel @ 2011-05-11 20:46 UTC (permalink / raw
To: gentoo-commits
commit: 838abfdd3701f31bb1cede3444fb8b192a1e87c4
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Wed May 11 21:07:32 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed May 11 21:07:32 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=838abfdd
[media-gfx/digikam] QA cleanups
(Portage version: 2.1.9.48/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
media-gfx/digikam/ChangeLog | 4 +++
media-gfx/digikam/Manifest | 30 +++++++++++++-------------
media-gfx/digikam/digikam-2.0.0_beta5.ebuild | 29 +++++++++++-------------
3 files changed, 32 insertions(+), 31 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index d8a92d1..380f301 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -3,6 +3,10 @@
# $Header: $
11 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ digikam-2.0.0_beta5.ebuild:
+ QA cleanups
+
+ 11 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
-digikam-2.0.0_beta2.ebuild, -digikam-2.0.0_beta3.ebuild,
-digikam-2.0.0_beta4.ebuild, digikam-2.0.0_beta5.ebuild:
Remove old; drop ppc keyword
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 7ab4094..f0335e3 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -31,23 +31,23 @@ EBUILD digikam-1.2.0-r4.ebuild 3241 RMD160 97240d9bf66f91276583380abb44abcca32ae
EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
EBUILD digikam-1.9.0-r1.ebuild 3260 RMD160 9a81da4a6a320bc4f86b05665654c4b7e0cbacdf SHA1 5bfc5984b6f9bdc9b724b9a6196123ec812bc703 SHA256 a4b15d1c633ad4f793471d09563a1c4ee14d3889de3cc09afed8df85e83d5a28
EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
-EBUILD digikam-2.0.0_beta5.ebuild 3328 RMD160 4191160ab7e4a047fd2238ea36a2f67182afc14b SHA1 d10210b393f1d9cd50bfe5bb9fb3ae790726ecb5 SHA256 ebd0196594424cba08993acc98669c87b11c47a8460544cdb9d50051cf521a03
-MISC ChangeLog 10220 RMD160 5c32a7cd08f5ed1fd140ec8d7e4c2434ffea3779 SHA1 42eaf019fdbd422eff3e4dafd1d7a7a303f8a635 SHA256 d1ce6d4198ffcc18c1f3f411dfbc5f2840ffa55a7305f55bd1c6782a49168b1e
+EBUILD digikam-2.0.0_beta5.ebuild 3205 RMD160 143f3e02e6f3c5b36b69036ccc3b7dbe4d71ff84 SHA1 029cfd682758e50516045f4ae523bf18c6995fe7 SHA256 aac452e2e1a9aa1234627df76a67fbf36ef2f8d242e83db3637e1fcf66567c17
+MISC ChangeLog 10322 RMD160 5557f560f9bf482584dc81d06b95468628356554 SHA1 d9fe7c8aef1193ad14ace94745352c6132997957 SHA256 687de0ef9b609b8d3537ab73947688e59788935ebe1c02b8fe894f2809449585
MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJNyvlPAAoJENwGBM22xffe00MP+wbLx5aIHyzr62TjQzSRVVza
-yHgVanW/f9RpH5vSeb8hd1a3Hsy6enEABR/oM1VmYkKmm3EfGbeIIjDmEAgOP77E
-MhqaeRwPet8hMNDQ/uzLa+OKKsQNZhr9QL6XaL7wrkKtl3wKu9U5b0LazpgnV0GR
-FjmMi00Mb3+BO0kNTtZ0+D1S0fnshkA3vOQvxNu6/qY0ZpFUcFfRCe+YY3yKUz4M
-Hc3StUecwgGh8z4JMv6YxAXIswbfQZHdeJi875EIwxdJOpjASK0ezZh+PIyqGJRR
-RG7usR49kVawKbpS2FuwRuB+Gp6nVDxFBMQ+aPjY2HAd+4JfBaBv+077QRhUuHMb
-k5oZH7kYZtr+VQ679RsBZhowepHeIVoziidJ4X4lDIK04Gj836UJ89jzp5G08g4N
-mrNiktnrDMoLJD+XSH/uEyMwETBnDbG4oKY9mf9wAHbUbfu+PtzRtPfuVq+8Zsfx
-I6XZt+eigmGX5nP/B6j1pTLPuDrS+DM1xgMVQUi9W2ehJU/sbR/Ps8PkOqxAZil9
-eaZNfCLmIMUYrIfa2+PMTq/TmeGh7oAF9FlkbGcIpaMmuPUevyocUf39gLkJfo2w
-r377YB0Li5Z7qV5Cqil/NZ1IxmZwvMKOWvBAoJrQvB6p9BIDVqBykdZqSx53ck+B
-gDO1zWP38l6GjyT/mNYL
-=oI/F
+iQIcBAEBCgAGBQJNyvqUAAoJENwGBM22xffejYgP/jUTMG3wD+ZF/b2W7NgZ9n/R
+NAOVjiLcNpS5GX2HbVVgfWB+48MI7g7M6P1p0FYaHUWhSYmC23hadI4aFjw24qZ2
+80mEBcXAMciddoJ8k0KuauCaRqz3P7PmN2eZdbJtF5v01cYlPCuLrZxWTRcZscFB
+pcIpmIhc2c3YQieZHky7Wkm9RbkhCK3mnwfpVT7J/31FYAT0G6IXNjjcWli6LQ7u
+czAJ+DuszKbDcxAFs4G1O7g455zJ7g/UAFHqXcUURMdhgy2hiCeXe4tawq87Lym6
+rxDB3IzSnuTpGpJBSYUqyoGWdwLDnJsbt5RyNuuwAEMSFuvUeq72csTCYMdCEeEB
+HdTbdW7Ls3EG4xQMk17tUcPHXmHEOsmwp3eD3jypODFIN0rT3/EBEFoJsNt5Kc5d
+gWImcIVueF0cY/eiOLitsa60bF3wX43Z+foCBIz2/UIjFXcqbigyGyDuV6hnLgua
+tPav0kkcbTGpc4P7nzYrllfr/aZiuHfjRw/6/Wpeju8dvHy/eqIYPO2iciwk6KQD
+29igEfsjf8sM4M72wSzITRhyS6qvhd4cKXmqFGLD2kJ/Wc6+Jc94Qnotpre3ojss
+UK7ONfj0P/DGcNapOt5ccerxyKLWky22MWS+aRVm/gAQn7a11np0faNiRaaqoI+T
+yhpGzlw7jh5yQukcbzDf
+=HB0h
-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.0.0_beta5.ebuild b/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
index 758c687..4a7ad3b 100644
--- a/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
@@ -4,13 +4,11 @@
EAPI=4
-if [ "${PV}" != "9999" ]; then
- KDE_LINGUAS=""
-# KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
-# ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
-else
- KMNAME="extragear/graphics"
-fi
+KDE_LINGUAS=""
+#KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
+# ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
+
+KDE_HANDBOOK="optional"
CMAKE_MIN_VERSION=2.8
@@ -29,7 +27,7 @@ LICENSE="GPL-2
handbook? ( FDL-1.2 )"
KEYWORDS="~amd64 ~x86"
SLOT="4"
-IUSE="addressbook debug doc gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
+IUSE="addressbook debug doc gphoto2 semantic-desktop themedesigner +thumbnails video"
CDEPEND="
$(add_kdebase_dep kdelibs semantic-desktop)
@@ -53,15 +51,15 @@ CDEPEND="
virtual/mysql
x11-libs/qt-gui[qt3support]
|| ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
- addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
+ addressbook? ( $(add_kdebase_dep kdepimlibs) )
gphoto2? ( media-libs/libgphoto2 )
"
RDEPEND="${CDEPEND}
- >=kde-base/kreadconfig-${KDE_MINIMAL}
+ $(add_kdebase_dep kreadconfig)
video? (
|| (
- >=kde-base/mplayerthumbs-${KDE_MINIMAL}
- >=kde-base/ffmpegthumbs-${KDE_MINIMAL}
+ $(add_kdebase_dep mplayerthumbs)
+ $(add_kdebase_dep ffmpegthumbs)
)
)
"
@@ -94,7 +92,7 @@ src_configure() {
use semantic-desktop && backend="Nepomuk" || backend="None"
# LQR = only allows to choose between bundled/external
- mycmakeargs=(
+ local mycmakeargs=(
-DFORCED_UNBUNDLE=ON
-DWITH_LQR=ON
-DWITH_LENSFUN=ON
@@ -117,9 +115,8 @@ src_install() {
if use doc; then
# install the api documentation
- dodir /usr/share/doc/${PF}/html || die
insinto /usr/share/doc/${PF}/html
- doins -r ${CMAKE_BUILD_DIR}/api/html/* || die
+ doins -r ${CMAKE_BUILD_DIR}/api/html/*
fi
}
@@ -127,6 +124,6 @@ pkg_postinst() {
kde4-base_pkg_postinst
if use doc; then
- elog The digikam api documentation has been installed at /usr/share/doc/${PF}/html
+ elog "The digikam api documentation has been installed at /usr/share/doc/${PF}/html"
fi
}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/
@ 2011-05-11 20:46 Andreas K. Huettel
0 siblings, 0 replies; 17+ messages in thread
From: Andreas K. Huettel @ 2011-05-11 20:46 UTC (permalink / raw
To: gentoo-commits
commit: 81421148a28672b223438b6d0d8f68585924c56f
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Wed May 11 21:02:07 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed May 11 21:02:07 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=81421148
[media-gfx/digikam] Remove old; drop ppc keyword
(Portage version: 2.1.9.48/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
media-gfx/digikam/ChangeLog | 5 +
media-gfx/digikam/Manifest | 36 +++----
media-gfx/digikam/digikam-2.0.0_beta2.ebuild | 135 --------------------------
media-gfx/digikam/digikam-2.0.0_beta3.ebuild | 135 --------------------------
media-gfx/digikam/digikam-2.0.0_beta4.ebuild | 132 -------------------------
media-gfx/digikam/digikam-2.0.0_beta5.ebuild | 2 +-
6 files changed, 21 insertions(+), 424 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 0b2b979..d8a92d1 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 11 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ -digikam-2.0.0_beta2.ebuild, -digikam-2.0.0_beta3.ebuild,
+ -digikam-2.0.0_beta4.ebuild, digikam-2.0.0_beta5.ebuild:
+ Remove old; drop ppc keyword
+
*digikam-1.9.0-r1 (11 May 2011)
11 May 2011; Andreas K. Huettel <dilfridge@gentoo.org> digikam-1.9.0.ebuild,
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index dde7355..7ab4094 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -25,35 +25,29 @@ AUX digikam-2.0.0_beta5-docs.patch 1364 RMD160 e7e618d7ae5939328d43e1b41e11f6b4e
DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880853 SHA1 7f12caf737a05043c7a9a5291a448684e5a4e2e6 SHA256 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206
DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
-DIST digikam-2.0.0-beta2.tar.bz2 23685947 RMD160 0370c304af9dfcc380d97747f698ab449e0d0beb SHA1 dbc62eed97c54dbdfff97690d4eb218d361e0d25 SHA256 15f49e18fefdf7bcce8b31bb77b4fe31368f16d88c039842c58e7cbafa58fd49
-DIST digikam-2.0.0-beta3.tar.bz2 24063835 RMD160 61871d8f1f28acd7f3b83f261a94715d97bf71ea SHA1 7688ef4eec77b55e36ecd8f55d92635c36f38349 SHA256 60c9f050b07a787e1512173b7b871dbf9babc730804f98829dae53229e16b97e
-DIST digikam-2.0.0-beta4.tar.bz2 43322316 RMD160 6af7f9ad6b757e97081391c5972abd744d45cfa6 SHA1 a5aef57a8be66b033e88d78f838c318ffe8df235 SHA256 aa85678e2a83cdb41ef70584e2a691c457759f50aadc0cc7019a33513ee16b63
DIST digikam-2.0.0-beta5.tar.bz2 43494127 RMD160 715f9f3f1695bad8e74dbeb9313da7a5303f0473 SHA1 97432e5997f00028c1acff38e2e0a791294c2aaf SHA256 118ea42cebaec6795b89cbb6018bdfa1d0e664eeda9b09ac0fd4083e3969f394
DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
EBUILD digikam-1.2.0-r4.ebuild 3241 RMD160 97240d9bf66f91276583380abb44abcca32aef53 SHA1 541cb89174e630ede2a012f75576b1e66a7e5834 SHA256 7b99de04c49c27afc4047b49eb88558d34ab83cdddf272d3a282313f79e88c48
EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
EBUILD digikam-1.9.0-r1.ebuild 3260 RMD160 9a81da4a6a320bc4f86b05665654c4b7e0cbacdf SHA1 5bfc5984b6f9bdc9b724b9a6196123ec812bc703 SHA256 a4b15d1c633ad4f793471d09563a1c4ee14d3889de3cc09afed8df85e83d5a28
EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
-EBUILD digikam-2.0.0_beta2.ebuild 3339 RMD160 b930008d6fe94d757ecd23eb80949114e62b835b SHA1 10351caff0808bee413c99160b227cffd1b84473 SHA256 23872b2b307c1021af88bf994bcc0553eb01e330585d706067dfe2b8dea56d3e
-EBUILD digikam-2.0.0_beta3.ebuild 3339 RMD160 e931dff9b3dc632d586c27323c1b6ae96cfa74d8 SHA1 78481f6fb42060e4d240c568069e4fb48afc3bdb SHA256 311d6f8f1b22c8b40da470c07e1813db3c6cbeab64ded51c3a37a46dda747e60
-EBUILD digikam-2.0.0_beta4.ebuild 3333 RMD160 f233ebb7788ec8caa3a2bca7d341f635d685b1da SHA1 806b4fc1347782c1f59c3d57f68eb83396389460 SHA256 1968e6f68542a68c796307a67a0804349f9b46123b6b7369c59a8e5496189ebd
-EBUILD digikam-2.0.0_beta5.ebuild 3333 RMD160 295b6cec8ae5af7b42b2b4e5ed801fc9806d627b SHA1 cbaeae4a388b4c6955b6e5faabbfcb79117379a7 SHA256 c602bab5a10e4f451e1c3194310f1c36cc1b0f81d788bc1929d70f1d0732d595
-MISC ChangeLog 10012 RMD160 4dea1e365ef683be3673f06adffbb3a1604a8bd0 SHA1 34ad5f35a0f37858523074fddefa68647e65cc2e SHA256 a255618ef94147f3b2090cf3b1019ae2a5705f49cedceff99e30494bcf52e430
+EBUILD digikam-2.0.0_beta5.ebuild 3328 RMD160 4191160ab7e4a047fd2238ea36a2f67182afc14b SHA1 d10210b393f1d9cd50bfe5bb9fb3ae790726ecb5 SHA256 ebd0196594424cba08993acc98669c87b11c47a8460544cdb9d50051cf521a03
+MISC ChangeLog 10220 RMD160 5c32a7cd08f5ed1fd140ec8d7e4c2434ffea3779 SHA1 42eaf019fdbd422eff3e4dafd1d7a7a303f8a635 SHA256 d1ce6d4198ffcc18c1f3f411dfbc5f2840ffa55a7305f55bd1c6782a49168b1e
MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJNyviTAAoJENwGBM22xffemR8P/RW2rFuybtK7A2igiHW3VGG9
-pWFSwg/nRr5a2Dgwmn2PWvDlhXxgrT/nBNKzj0/jr1pFa8PVa73deuY5UZLpjfMG
-/OI942UpjjlsJUV3WJF1HVFO4dYg4euqdn4o4f8/B6kw8kIUT1h8diQiANaxwqvG
-Q9Tl0P0CumD/1yKBrvWfhbC1Uj/+ge1UHQ5FEcvdCH9wQkBjA7XxhEdTUpp1fFsW
-BB7Rv5gueDVNn4vrj4kuUQTbGP5yMs8HbzoZv2wXIBK+LlUHnzop18lEG3nftoev
-ijQyg71R2OgJTLwPtNpSCVW5UW7EBxj4maH7HexErr9oiFVyKhcn1NOGQ8Cc636g
-v8AvEBKdsHdU6cAurbecY9t+9k2hRHXtOjlxhOZ3wlFhA2SrW46uaMqMPSEGmwMr
-c4+2quVTr9GsBGvebwoTBx1Nexw3hXPEdbGFLIF/JGC3oOQDkWFIv+vR3EnJrwvA
-8M9aRwD/vqaNtdiPVvY+WRiiL/xn7+/IpswYQxzxzMsH1NVBBw/u1pYgWijP1Mm5
-a4FXXYeAqd82LeVBKSIY3p8AXlqA+H3K4QhOi2aGXQmMGW1d4V1TfO6SOh7wUCc6
-7JfToxqj8I1mvSLudVxBN4LsCR9bk2KzbodQ2iatFNkFy9ez5Ea9yrBbqvrEoaF0
-1016CC4q2o7KCs7XHHBQ
-=LCA8
+iQIcBAEBCgAGBQJNyvlPAAoJENwGBM22xffe00MP+wbLx5aIHyzr62TjQzSRVVza
+yHgVanW/f9RpH5vSeb8hd1a3Hsy6enEABR/oM1VmYkKmm3EfGbeIIjDmEAgOP77E
+MhqaeRwPet8hMNDQ/uzLa+OKKsQNZhr9QL6XaL7wrkKtl3wKu9U5b0LazpgnV0GR
+FjmMi00Mb3+BO0kNTtZ0+D1S0fnshkA3vOQvxNu6/qY0ZpFUcFfRCe+YY3yKUz4M
+Hc3StUecwgGh8z4JMv6YxAXIswbfQZHdeJi875EIwxdJOpjASK0ezZh+PIyqGJRR
+RG7usR49kVawKbpS2FuwRuB+Gp6nVDxFBMQ+aPjY2HAd+4JfBaBv+077QRhUuHMb
+k5oZH7kYZtr+VQ679RsBZhowepHeIVoziidJ4X4lDIK04Gj836UJ89jzp5G08g4N
+mrNiktnrDMoLJD+XSH/uEyMwETBnDbG4oKY9mf9wAHbUbfu+PtzRtPfuVq+8Zsfx
+I6XZt+eigmGX5nP/B6j1pTLPuDrS+DM1xgMVQUi9W2ehJU/sbR/Ps8PkOqxAZil9
+eaZNfCLmIMUYrIfa2+PMTq/TmeGh7oAF9FlkbGcIpaMmuPUevyocUf39gLkJfo2w
+r377YB0Li5Z7qV5Cqil/NZ1IxmZwvMKOWvBAoJrQvB6p9BIDVqBykdZqSx53ck+B
+gDO1zWP38l6GjyT/mNYL
+=oI/F
-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.0.0_beta2.ebuild b/media-gfx/digikam/digikam-2.0.0_beta2.ebuild
deleted file mode 100644
index d49dad4..0000000
--- a/media-gfx/digikam/digikam-2.0.0_beta2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.6.0.ebuild,v 1.1 2010/11/25 20:30:29 dilfridge Exp $
-
-EAPI=3
-
-if [ "${PV}" != "9999" ]; then
- KDE_LINGUAS=""
-# KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
-# ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
-else
- KMNAME="extragear/graphics"
-fi
-
-CMAKE_MIN_VERSION=2.8
-
-KDE_MINIMAL="4.6"
-KDEGRAPHICS_MINIMAL="4.6.26"
-
-inherit kde4-base
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="A digital photo management application for KDE."
-HOMEPAGE="http://www.digikam.org/"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
- handbook? ( mirror://gentoo/${PN}-doc-1.4.0.tar.bz2 )"
-
-LICENSE="GPL-2
- handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="4"
-IUSE="addressbook debug doc gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
-
-CDEPEND="
- $(add_kdebase_dep kdelibs semantic-desktop)
- $(add_kdebase_dep marble plasma)
- $(add_kdebase_dep libkipi)
- $(add_kdebase_dep libkexiv2)
- >=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL}
- >=media-libs/libkface-${PV}
- >=media-libs/libkmap-${PV}
- $(add_kdebase_dep solid)
- media-libs/jasper
- virtual/jpeg
- media-libs/lcms:0
- >=media-libs/lensfun-0.2.5
- media-libs/liblqr
- media-libs/libpng
- media-libs/tiff
- media-libs/libpgf
- >=media-plugins/kipi-plugins-1.2.0-r1
- >=sci-libs/clapack-3.2.1-r3
- virtual/mysql
- x11-libs/qt-gui[qt3support]
- || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
- addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
- gphoto2? ( media-libs/libgphoto2 )
-"
-RDEPEND="${CDEPEND}
- >=kde-base/kreadconfig-${KDE_MINIMAL}
- video? (
- || (
- >=kde-base/mplayerthumbs-${KDE_MINIMAL}
- >=kde-base/ffmpegthumbs-${KDE_MINIMAL}
- )
- )
-"
-DEPEND="${CDEPEND}
- sys-devel/gettext
- doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/${MY_P}/core"
-
-PATCHES=( "${FILESDIR}/${PN}"-2.0.0_beta1-docs.patch )
-
-src_prepare() {
- # just to make absolutely sure
- rm -rf "${WORKDIR}/${MY_P}/extra" || die
-
- if use handbook; then
- mv "${WORKDIR}/${PN}"-1.4.0/* "${S}/" || die
- fi
- kde4-base_src_prepare
- if use handbook; then
- echo "add_subdirectory( doc )" >> CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local backend
-
- use semantic-desktop && backend="Nepomuk" || backend="None"
- # LQR = only allows to choose between bundled/external
- mycmakeargs=(
- -DFORCED_UNBUNDLE=ON
- -DWITH_LQR=ON
- -DWITH_LENSFUN=ON
- -DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
- $(cmake-utils_use_with addressbook KdepimLibs)
- $(cmake-utils_use_build doc)
- -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)
- )
-
- kde4-base_src_configure
-}
-
-src_install() {
- kde4-base_src_install
-
- if use doc; then
- # install the api documentation
- dodir /usr/share/doc/${PF}/html || die
- insinto /usr/share/doc/${PF}/html
- doins -r ${CMAKE_BUILD_DIR}/api/html/* || die
- fi
-
- if use handbook; then
- dodoc readme-handbook.txt || die
- 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.0.0_beta3.ebuild b/media-gfx/digikam/digikam-2.0.0_beta3.ebuild
deleted file mode 100644
index 23d1f34..0000000
--- a/media-gfx/digikam/digikam-2.0.0_beta3.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.6.0.ebuild,v 1.1 2010/11/25 20:30:29 dilfridge Exp $
-
-EAPI=3
-
-if [ "${PV}" != "9999" ]; then
- KDE_LINGUAS=""
-# KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
-# ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
-else
- KMNAME="extragear/graphics"
-fi
-
-CMAKE_MIN_VERSION=2.8
-
-KDE_MINIMAL="4.6"
-KDEGRAPHICS_MINIMAL="4.6.27"
-
-inherit kde4-base
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="A digital photo management application for KDE."
-HOMEPAGE="http://www.digikam.org/"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
- handbook? ( mirror://gentoo/${PN}-doc-1.4.0.tar.bz2 )"
-
-LICENSE="GPL-2
- handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="4"
-IUSE="addressbook debug doc gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
-
-CDEPEND="
- $(add_kdebase_dep kdelibs semantic-desktop)
- $(add_kdebase_dep marble plasma)
- $(add_kdebase_dep libkipi)
- $(add_kdebase_dep libkexiv2)
- >=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL}
- >=media-libs/libkface-${PV}
- >=media-libs/libkmap-${PV}
- $(add_kdebase_dep solid)
- media-libs/jasper
- virtual/jpeg
- media-libs/lcms:0
- >=media-libs/lensfun-0.2.5
- media-libs/liblqr
- media-libs/libpng
- media-libs/tiff
- media-libs/libpgf
- >=media-plugins/kipi-plugins-1.2.0-r1
- >=sci-libs/clapack-3.2.1-r3
- virtual/mysql
- x11-libs/qt-gui[qt3support]
- || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
- addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
- gphoto2? ( media-libs/libgphoto2 )
-"
-RDEPEND="${CDEPEND}
- >=kde-base/kreadconfig-${KDE_MINIMAL}
- video? (
- || (
- >=kde-base/mplayerthumbs-${KDE_MINIMAL}
- >=kde-base/ffmpegthumbs-${KDE_MINIMAL}
- )
- )
-"
-DEPEND="${CDEPEND}
- sys-devel/gettext
- doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/${MY_P}/core"
-
-PATCHES=( "${FILESDIR}/${PN}"-2.0.0_beta1-docs.patch )
-
-src_prepare() {
- # just to make absolutely sure
- rm -rf "${WORKDIR}/${MY_P}/extra" || die
-
- if use handbook; then
- mv "${WORKDIR}/${PN}"-1.4.0/* "${S}/" || die
- fi
- kde4-base_src_prepare
- if use handbook; then
- echo "add_subdirectory( doc )" >> CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local backend
-
- use semantic-desktop && backend="Nepomuk" || backend="None"
- # LQR = only allows to choose between bundled/external
- mycmakeargs=(
- -DFORCED_UNBUNDLE=ON
- -DWITH_LQR=ON
- -DWITH_LENSFUN=ON
- -DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
- $(cmake-utils_use_with addressbook KdepimLibs)
- $(cmake-utils_use_build doc)
- -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)
- )
-
- kde4-base_src_configure
-}
-
-src_install() {
- kde4-base_src_install
-
- if use doc; then
- # install the api documentation
- dodir /usr/share/doc/${PF}/html || die
- insinto /usr/share/doc/${PF}/html
- doins -r ${CMAKE_BUILD_DIR}/api/html/* || die
- fi
-
- if use handbook; then
- dodoc readme-handbook.txt || die
- 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.0.0_beta4.ebuild b/media-gfx/digikam/digikam-2.0.0_beta4.ebuild
deleted file mode 100644
index f03da3a..0000000
--- a/media-gfx/digikam/digikam-2.0.0_beta4.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.6.0.ebuild,v 1.1 2010/11/25 20:30:29 dilfridge Exp $
-
-EAPI=3
-
-if [ "${PV}" != "9999" ]; then
- KDE_LINGUAS=""
-# KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
-# ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
-else
- KMNAME="extragear/graphics"
-fi
-
-CMAKE_MIN_VERSION=2.8
-
-KDE_MINIMAL="4.6"
-KDEGRAPHICS_MINIMAL="4.6.28"
-
-inherit kde4-base
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="A digital photo management application for KDE."
-HOMEPAGE="http://www.digikam.org/"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2
- handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="4"
-IUSE="addressbook debug doc gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
-
-CDEPEND="
- $(add_kdebase_dep kdelibs semantic-desktop)
- $(add_kdebase_dep marble plasma)
- $(add_kdebase_dep libkipi)
- $(add_kdebase_dep libkexiv2)
- >=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL}
- >=media-libs/libkface-${PV}
- >=media-libs/libkmap-${PV}
- $(add_kdebase_dep solid)
- media-libs/jasper
- virtual/jpeg
- media-libs/lcms:0
- >=media-libs/lensfun-0.2.5
- media-libs/liblqr
- media-libs/libpng
- media-libs/tiff
- media-libs/libpgf
- >=media-plugins/kipi-plugins-1.2.0-r1
- || ( >=sci-libs/clapack-3.2.1-r3 sci-libs/lapack-atlas )
- virtual/mysql
- x11-libs/qt-gui[qt3support]
- || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
- addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
- gphoto2? ( media-libs/libgphoto2 )
-"
-RDEPEND="${CDEPEND}
- >=kde-base/kreadconfig-${KDE_MINIMAL}
- video? (
- || (
- >=kde-base/mplayerthumbs-${KDE_MINIMAL}
- >=kde-base/ffmpegthumbs-${KDE_MINIMAL}
- )
- )
-"
-DEPEND="${CDEPEND}
- sys-devel/gettext
- doc? ( app-doc/doxygen )
-"
-
-PATCHES=( "${FILESDIR}/${PN}"-2.0.0_beta4-docs.patch )
-
-S="${WORKDIR}/${MY_P}/core"
-
-src_prepare() {
- # just to make absolutely sure
- rm -rf "${WORKDIR}/${MY_P}/extra" || die
-
- mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
- echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
- echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
-
- 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
- mycmakeargs=(
- -DFORCED_UNBUNDLE=ON
- -DWITH_LQR=ON
- -DWITH_LENSFUN=ON
- -DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
- $(cmake-utils_use_with addressbook KdepimLibs)
- $(cmake-utils_use_build doc)
- -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)
- )
-
- kde4-base_src_configure
-}
-
-src_install() {
- kde4-base_src_install
-
- if use doc; then
- # install the api documentation
- dodir /usr/share/doc/${PF}/html || die
- insinto /usr/share/doc/${PF}/html
- doins -r ${CMAKE_BUILD_DIR}/api/html/* || die
- 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.0.0_beta5.ebuild b/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
index 398ba15..758c687 100644
--- a/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
@@ -27,7 +27,7 @@ HOMEPAGE="http://www.digikam.org/"
LICENSE="GPL-2
handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~x86"
SLOT="4"
IUSE="addressbook debug doc gphoto2 handbook semantic-desktop themedesigner +thumbnails video"
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/
@ 2011-05-20 22:25 Andreas K. Huettel
0 siblings, 0 replies; 17+ messages in thread
From: Andreas K. Huettel @ 2011-05-20 22:25 UTC (permalink / raw
To: gentoo-commits
commit: c284c563e1ae78d909df11ed1026a3599f88aedc
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Fri May 20 22:45:33 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri May 20 22:45:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=c284c563
[media-gfx/digikam] Add upstream fix for libjpeg-turbo
(Portage version: 2.1.9.49/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
media-gfx/digikam/ChangeLog | 4 +++
media-gfx/digikam/Manifest | 31 +++++++++++++++--------------
media-gfx/digikam/digikam-1.9.0-r1.ebuild | 1 +
3 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 380f301..075e712 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 20 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ digikam-1.9.0-r1.ebuild:
+ Add upstream fix for libjpeg-turbo
+
11 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
digikam-2.0.0_beta5.ebuild:
QA cleanups
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index f0335e3..3aaf01f 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -19,6 +19,7 @@ AUX digikam-1.8.0-gcc46.patch 512 RMD160 950c4744a8d4bfe88f0f19233bfd5aefb87ccbb
AUX digikam-1.8.0-tests.patch 914 RMD160 520675d0fb1080549a0c3f5c67fc51d36bb19b1d SHA1 1e80a74d91f593939a69a7f77870cbefbbb73235 SHA256 29a7e68abd804019b1ae533a62920e931d5057aaa10bf20cd81358cf8bfcee1c
AUX digikam-1.9.0-docs.patch 1466 RMD160 d12a4bd9e825d88863da954763641157a87f11bd SHA1 7496668276f5a54d6ffde0a71ff7dfc6252ff3e3 SHA256 f348ab1a931af78e1aa752676a9515a50183dc07c32a99cdfd59a32dd2ece2af
AUX digikam-1.9.0-nomysql.patch 3323 RMD160 9b03cc09f81188a9373212af0bfc079eeced3c37 SHA1 7fe8a51f5d8c5eddfc22f37f6741f0c96ca64f16 SHA256 c3e09ee35172c9e38d13fe20b5e65ae1d53e954e3c50be1fbddd0223990cac5c
+AUX digikam-1.9.0-turbo.patch 2265 RMD160 ecff0e0fa2ba6d51cdb6ec5bb90b41c3ed7310a2 SHA1 e9383e730b81348656c3482700dec59a3ba5a499 SHA256 765338d842b39622428c068d9e190cf0f97933cd66845fea2ff0b5f79ed7b2cc
AUX digikam-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec4723860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8bf8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c
AUX digikam-2.0.0_beta4-docs.patch 1361 RMD160 0a68569608e99781708b5c242c90e0df6808a655 SHA1 d33c4ca548bd3f605d992ea32f287212ef68bd77 SHA256 9902322da1310bcf728d8172d5bbd53f7080555bfdd629dbe0eba069d9eec8ac
AUX digikam-2.0.0_beta5-docs.patch 1364 RMD160 e7e618d7ae5939328d43e1b41e11f6b4eb2f4821 SHA1 ff5519b3ee8cf19e091c1ac1b38817485921b7d2 SHA256 4113cc07a61d22a727f73fed917eb4ae82493f700673daf58acfcce455914964
@@ -29,25 +30,25 @@ DIST digikam-2.0.0-beta5.tar.bz2 43494127 RMD160 715f9f3f1695bad8e74dbeb9313da7a
DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
EBUILD digikam-1.2.0-r4.ebuild 3241 RMD160 97240d9bf66f91276583380abb44abcca32aef53 SHA1 541cb89174e630ede2a012f75576b1e66a7e5834 SHA256 7b99de04c49c27afc4047b49eb88558d34ab83cdddf272d3a282313f79e88c48
EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
-EBUILD digikam-1.9.0-r1.ebuild 3260 RMD160 9a81da4a6a320bc4f86b05665654c4b7e0cbacdf SHA1 5bfc5984b6f9bdc9b724b9a6196123ec812bc703 SHA256 a4b15d1c633ad4f793471d09563a1c4ee14d3889de3cc09afed8df85e83d5a28
+EBUILD digikam-1.9.0-r1.ebuild 3299 RMD160 c4f0ffdc7d1bb89581c721a4a85310e7ca4b704f SHA1 1346318824da28a94445ebac446c737e46906dae SHA256 b73c19ab5cf8ecddec3802687b00e664e3fbc7b054a504173b540151e0c324f6
EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
EBUILD digikam-2.0.0_beta5.ebuild 3205 RMD160 143f3e02e6f3c5b36b69036ccc3b7dbe4d71ff84 SHA1 029cfd682758e50516045f4ae523bf18c6995fe7 SHA256 aac452e2e1a9aa1234627df76a67fbf36ef2f8d242e83db3637e1fcf66567c17
-MISC ChangeLog 10322 RMD160 5557f560f9bf482584dc81d06b95468628356554 SHA1 d9fe7c8aef1193ad14ace94745352c6132997957 SHA256 687de0ef9b609b8d3537ab73947688e59788935ebe1c02b8fe894f2809449585
+MISC ChangeLog 10444 RMD160 8c18718d9aaf3cb377120bcbd0d2e4057173ab9e SHA1 c9cf5531a2021f1ba060f1c1f37817f6439fe30e SHA256 71b3d1ed8956b61334c9ab190140dcccc160809e072b48b74be79459f8d10d24
MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJNyvqUAAoJENwGBM22xffejYgP/jUTMG3wD+ZF/b2W7NgZ9n/R
-NAOVjiLcNpS5GX2HbVVgfWB+48MI7g7M6P1p0FYaHUWhSYmC23hadI4aFjw24qZ2
-80mEBcXAMciddoJ8k0KuauCaRqz3P7PmN2eZdbJtF5v01cYlPCuLrZxWTRcZscFB
-pcIpmIhc2c3YQieZHky7Wkm9RbkhCK3mnwfpVT7J/31FYAT0G6IXNjjcWli6LQ7u
-czAJ+DuszKbDcxAFs4G1O7g455zJ7g/UAFHqXcUURMdhgy2hiCeXe4tawq87Lym6
-rxDB3IzSnuTpGpJBSYUqyoGWdwLDnJsbt5RyNuuwAEMSFuvUeq72csTCYMdCEeEB
-HdTbdW7Ls3EG4xQMk17tUcPHXmHEOsmwp3eD3jypODFIN0rT3/EBEFoJsNt5Kc5d
-gWImcIVueF0cY/eiOLitsa60bF3wX43Z+foCBIz2/UIjFXcqbigyGyDuV6hnLgua
-tPav0kkcbTGpc4P7nzYrllfr/aZiuHfjRw/6/Wpeju8dvHy/eqIYPO2iciwk6KQD
-29igEfsjf8sM4M72wSzITRhyS6qvhd4cKXmqFGLD2kJ/Wc6+Jc94Qnotpre3ojss
-UK7ONfj0P/DGcNapOt5ccerxyKLWky22MWS+aRVm/gAQn7a11np0faNiRaaqoI+T
-yhpGzlw7jh5yQukcbzDf
-=HB0h
+iQIcBAEBCgAGBQJN1u8NAAoJENwGBM22xffevNMP/0RO3TVvyZFSplxh2ojq37YR
+p6XlxYWBHXLBBLmaOum/F1y7oVB3JMCtOIVIownNl9YQ4K6sb1nT/FlktwN2ovtR
+4fzR3aNVL19VRV25OEc86E+xCBBZoqnp9b9+KwE6qlyvs+t3kJk+GnrVYdUWGNwY
+TDfPEZoUw7gxVK0HrtvJYRdCJ2EZcNFRW0Lli9xiarfbGso18MswmXrjHIT+cmOM
+GQwiOc2oFm7jhpKG+TWe51hS0CYgOeyO8I5JwazyD66tRAcua0buqyKHYHwyNIin
+hJvCl2G/ko1hOvvy+bVf/D7uv8Vvt4ME7MLkmXsXy3vvdTPnvG+HgkP784U8IH6Z
+DAdPp8izR1jsHQeilWUpTROxsT+9u8SOWEeEbKhQmCKp7cC5Uf8KVPTbg1TuanBD
+yTALTXXAv6rR7UolzqwrHyU69rUqjZVmygujr8CoL/9OJjbOanSb+Mm/U9y4WSlj
+XYEVss53iz8qwp38j9FpzSNuv3qPaRPLoAiOAkPpOus15625cicyGRbiYg0blG4T
+G+1wfqWvvWAhHaF3Hx5fMMZc0iVQzMgHIcgcro0pm4+tKNkD8vBvsJApjJxCcBr7
+UtG1CjL619SfAqz/PDcDDCyxa4KhJv2279cwpc9uujVQea8pSN//1WZyjkEU7f6A
+thO3MEtR/pvKtrAPniEZ
+=RR4c
-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-1.9.0-r1.ebuild b/media-gfx/digikam/digikam-1.9.0-r1.ebuild
index 6e439a4..1eff898 100644
--- a/media-gfx/digikam/digikam-1.9.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-1.9.0-r1.ebuild
@@ -68,6 +68,7 @@ PATCHES=(
"${FILESDIR}/${PN}"-1.9.0-docs.patch
"${FILESDIR}/${PN}"-1.8.0-tests.patch
"${FILESDIR}/${PN}"-1.9.0-nomysql.patch
+ "${FILESDIR}/${PN}"-1.9.0-turbo.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/
@ 2011-05-20 22:57 Andreas K. Huettel
0 siblings, 0 replies; 17+ messages in thread
From: Andreas K. Huettel @ 2011-05-20 22:57 UTC (permalink / raw
To: gentoo-commits
commit: 9069ac2b5021a85e8d404ec86ad234990b214edd
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Fri May 20 23:18:13 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri May 20 23:18:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=9069ac2b
[media-gfx/digikam] Add build fix for libjpeg-turbo
(Portage version: 2.1.9.49/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
media-gfx/digikam/ChangeLog | 4 +++
media-gfx/digikam/Manifest | 30 +++++++++++++-------------
media-gfx/digikam/digikam-2.0.0_beta5.ebuild | 5 +++-
3 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 075e712..a6f29c3 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -3,6 +3,10 @@
# $Header: $
20 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ digikam-2.0.0_beta5.ebuild:
+ Backport build fix for libjpeg-turbo
+
+ 20 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
digikam-1.9.0-r1.ebuild:
Add upstream fix for libjpeg-turbo
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 3aaf01f..b4f149b 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -32,23 +32,23 @@ EBUILD digikam-1.2.0-r4.ebuild 3241 RMD160 97240d9bf66f91276583380abb44abcca32ae
EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
EBUILD digikam-1.9.0-r1.ebuild 3299 RMD160 c4f0ffdc7d1bb89581c721a4a85310e7ca4b704f SHA1 1346318824da28a94445ebac446c737e46906dae SHA256 b73c19ab5cf8ecddec3802687b00e664e3fbc7b054a504173b540151e0c324f6
EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
-EBUILD digikam-2.0.0_beta5.ebuild 3205 RMD160 143f3e02e6f3c5b36b69036ccc3b7dbe4d71ff84 SHA1 029cfd682758e50516045f4ae523bf18c6995fe7 SHA256 aac452e2e1a9aa1234627df76a67fbf36ef2f8d242e83db3637e1fcf66567c17
-MISC ChangeLog 10444 RMD160 8c18718d9aaf3cb377120bcbd0d2e4057173ab9e SHA1 c9cf5531a2021f1ba060f1c1f37817f6439fe30e SHA256 71b3d1ed8956b61334c9ab190140dcccc160809e072b48b74be79459f8d10d24
+EBUILD digikam-2.0.0_beta5.ebuild 3245 RMD160 cc3e08c7da4a3bd909edb43f6b33ad3aff64b762 SHA1 a8501a880d6cc3c9e22153fc8288908de09c1d2a SHA256 8b5dfd0865866bb01fcfe6d5055b798194ea6e3dfefa29821dac73dd997643bf
+MISC ChangeLog 10571 RMD160 84badd91d2a84ebf32771ca0899d63f95c3b2c3f SHA1 71b474cdcef865e5c875c3f3abc9b961fed72c6e SHA256 86d481083d77a32df8f1bcae90457b5aa5b3e52d34c6ea9fc13fafc9ab4903fd
MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJN1u8NAAoJENwGBM22xffevNMP/0RO3TVvyZFSplxh2ojq37YR
-p6XlxYWBHXLBBLmaOum/F1y7oVB3JMCtOIVIownNl9YQ4K6sb1nT/FlktwN2ovtR
-4fzR3aNVL19VRV25OEc86E+xCBBZoqnp9b9+KwE6qlyvs+t3kJk+GnrVYdUWGNwY
-TDfPEZoUw7gxVK0HrtvJYRdCJ2EZcNFRW0Lli9xiarfbGso18MswmXrjHIT+cmOM
-GQwiOc2oFm7jhpKG+TWe51hS0CYgOeyO8I5JwazyD66tRAcua0buqyKHYHwyNIin
-hJvCl2G/ko1hOvvy+bVf/D7uv8Vvt4ME7MLkmXsXy3vvdTPnvG+HgkP784U8IH6Z
-DAdPp8izR1jsHQeilWUpTROxsT+9u8SOWEeEbKhQmCKp7cC5Uf8KVPTbg1TuanBD
-yTALTXXAv6rR7UolzqwrHyU69rUqjZVmygujr8CoL/9OJjbOanSb+Mm/U9y4WSlj
-XYEVss53iz8qwp38j9FpzSNuv3qPaRPLoAiOAkPpOus15625cicyGRbiYg0blG4T
-G+1wfqWvvWAhHaF3Hx5fMMZc0iVQzMgHIcgcro0pm4+tKNkD8vBvsJApjJxCcBr7
-UtG1CjL619SfAqz/PDcDDCyxa4KhJv2279cwpc9uujVQea8pSN//1WZyjkEU7f6A
-thO3MEtR/pvKtrAPniEZ
-=RR4c
+iQIcBAEBCgAGBQJN1va1AAoJENwGBM22xffee9YP/1/J8FHV7oxi6CAHgEwmfIu+
+Hua3yYsOKlsdAGXy9WJhr8FilKP/QY2U/PuSeC9s3yNft5sgjxvZ8cVzYDt1gfEl
+MhI5OPgykaT5FDJGbRgtTYN5yEmqvUMC3lVgTDK8vnnasDAUIun16N7TLHHuPCwD
+cSTxU7AmvrdjRhGAidR6C/JDCI60X3d9wFdywZov/WREqdPp97Ew5H/mDe1M3Sil
+Lwr2TYdHL1fbIozjQpLalfk2XceAZHtxrJBe1dvOGCgzcy1flg/czjogC8g0ZW9k
+ISm/UYF3DVx12igyhVjCfHwOM8BvgIgZ5jTwRGpBMgisYXAMJPSRiKNpC0kyqlV8
+VUcXX7DOJVrg/3TX5kpniVTa4R/CHXGIK9EGbn5D3ViDTAl6U2GSbWa6HSwm6BJC
+WLTODEK1aaae+zb2iyp91Q1lGcbsUWsI9D1dtCfqL/BVe/q+lnzn4eLe3qHYQqjt
++yetfbYVOLcLRxUaa6Ytv02LMKhJy0hVzmpaBYVUexOKBXdVEF+fuOiAUF+IDZQg
+ivS22ZDqsp8ZhS50ZWa77Vj4Q2XK1KTHOU0Gs+obvxry5edjpz9XgvmwVdd2rkk1
+K8sCm+blJu97OMwdJifCSIWOD4Id/9xPnmKAN2ld2c3OI38Ccex4vl7hsI5oFfcY
+cslW5F0Pi2eTd8SgqwbW
+=fKL6
-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.0.0_beta5.ebuild b/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
index 4a7ad3b..b8e43c9 100644
--- a/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
@@ -68,7 +68,10 @@ DEPEND="${CDEPEND}
doc? ( app-doc/doxygen )
"
-PATCHES=( "${FILESDIR}/${PN}"-2.0.0_beta5-docs.patch )
+PATCHES=(
+ "${FILESDIR}/${PN}"-2.0.0_beta5-docs.patch
+ "${FILESDIR}/${PN}"-1.9.0-turbo.patch
+)
S="${WORKDIR}/${MY_P}/core"
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/
@ 2011-07-02 18:19 Andreas Hüttel
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Hüttel @ 2011-07-02 18:19 UTC (permalink / raw
To: gentoo-commits
commit: 1ad2358888b5b115b5d1c334b15a3824be7bff12
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 2 18:03:13 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 2 18:03:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=1ad23588
Resync with kde overlay
(Portage version: 2.1.10.3/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)
---
media-gfx/digikam/ChangeLog | 6 +
media-gfx/digikam/Manifest | 24 +----
media-gfx/digikam/digikam-2.0.0_beta6.ebuild | 136 ++++++++++++++++++++++++++
3 files changed, 145 insertions(+), 21 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index a6f29c3..ac032cf 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*digikam-2.0.0_beta6 (02 Jul 2011)
+
+ 02 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ +digikam-2.0.0_beta6.ebuild:
+ Resync with kde overlay
+
20 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
digikam-2.0.0_beta5.ebuild:
Backport build fix for libjpeg-turbo
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index b4f149b..2f1e18d 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
AUX digikam-1.1.0-libpgf.patch 8996 RMD160 4f1a7ad7b28c43b3fe2e454eb3351f27a14bde6f SHA1 fd2b98e23c31d880a2a32f28161f279abef82c22 SHA256 f2001099ee5538a31a9660c223e59a25a19eb7c36a191831b849e1b81c58856d
AUX digikam-1.1.0-libpng14.patch 1580 RMD160 769e9bf4030d795349cb260854e26c189471ccbc SHA1 9b3123dad7bd7530db6833296dc1de7ec240fd54 SHA256 0ae5e279aedc80857cb27ace7d1609b6cf632853513445896b88a7365b763fb9
AUX digikam-1.2.0-docs-r3.patch 1926 RMD160 963f134c1bdb2e6b1a59b82efb7009733294ce6a SHA1 7cf403d5fd8f20142b7c1c6f6de225b5e66c28b9 SHA256 0687cd39780c1e40fec424f6ae5cce851e460681d02088eec763902c170ecb28
@@ -27,28 +24,13 @@ DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880
DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
DIST digikam-2.0.0-beta5.tar.bz2 43494127 RMD160 715f9f3f1695bad8e74dbeb9313da7a5303f0473 SHA1 97432e5997f00028c1acff38e2e0a791294c2aaf SHA256 118ea42cebaec6795b89cbb6018bdfa1d0e664eeda9b09ac0fd4083e3969f394
+DIST digikam-2.0.0-beta6.tar.bz2 43533320 RMD160 eb50febc2ade359f8d92e6673e4f73a6b57b6fa5 SHA1 3ca5356da07d6484ce2299627e9d54acf14e06a2 SHA256 5f81ce581ff8e1148c023b71365928509d497f0bd248f27c925ea3038cea2cea
DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
EBUILD digikam-1.2.0-r4.ebuild 3241 RMD160 97240d9bf66f91276583380abb44abcca32aef53 SHA1 541cb89174e630ede2a012f75576b1e66a7e5834 SHA256 7b99de04c49c27afc4047b49eb88558d34ab83cdddf272d3a282313f79e88c48
EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
EBUILD digikam-1.9.0-r1.ebuild 3299 RMD160 c4f0ffdc7d1bb89581c721a4a85310e7ca4b704f SHA1 1346318824da28a94445ebac446c737e46906dae SHA256 b73c19ab5cf8ecddec3802687b00e664e3fbc7b054a504173b540151e0c324f6
EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
EBUILD digikam-2.0.0_beta5.ebuild 3245 RMD160 cc3e08c7da4a3bd909edb43f6b33ad3aff64b762 SHA1 a8501a880d6cc3c9e22153fc8288908de09c1d2a SHA256 8b5dfd0865866bb01fcfe6d5055b798194ea6e3dfefa29821dac73dd997643bf
-MISC ChangeLog 10571 RMD160 84badd91d2a84ebf32771ca0899d63f95c3b2c3f SHA1 71b474cdcef865e5c875c3f3abc9b961fed72c6e SHA256 86d481083d77a32df8f1bcae90457b5aa5b3e52d34c6ea9fc13fafc9ab4903fd
+EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75
+MISC ChangeLog 10722 RMD160 2f317cc3ddb3c72cb3b2baa8fa18f129efde6c40 SHA1 b79a88ce00706eac870ef4d09d1f624d91578e52 SHA256 53633f404935588552bcbe0c9c40b68cfb2ed21b7a749021fbc8aacb1002c4ca
MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJN1va1AAoJENwGBM22xffee9YP/1/J8FHV7oxi6CAHgEwmfIu+
-Hua3yYsOKlsdAGXy9WJhr8FilKP/QY2U/PuSeC9s3yNft5sgjxvZ8cVzYDt1gfEl
-MhI5OPgykaT5FDJGbRgtTYN5yEmqvUMC3lVgTDK8vnnasDAUIun16N7TLHHuPCwD
-cSTxU7AmvrdjRhGAidR6C/JDCI60X3d9wFdywZov/WREqdPp97Ew5H/mDe1M3Sil
-Lwr2TYdHL1fbIozjQpLalfk2XceAZHtxrJBe1dvOGCgzcy1flg/czjogC8g0ZW9k
-ISm/UYF3DVx12igyhVjCfHwOM8BvgIgZ5jTwRGpBMgisYXAMJPSRiKNpC0kyqlV8
-VUcXX7DOJVrg/3TX5kpniVTa4R/CHXGIK9EGbn5D3ViDTAl6U2GSbWa6HSwm6BJC
-WLTODEK1aaae+zb2iyp91Q1lGcbsUWsI9D1dtCfqL/BVe/q+lnzn4eLe3qHYQqjt
-+yetfbYVOLcLRxUaa6Ytv02LMKhJy0hVzmpaBYVUexOKBXdVEF+fuOiAUF+IDZQg
-ivS22ZDqsp8ZhS50ZWa77Vj4Q2XK1KTHOU0Gs+obvxry5edjpz9XgvmwVdd2rkk1
-K8sCm+blJu97OMwdJifCSIWOD4Id/9xPnmKAN2ld2c3OI38Ccex4vl7hsI5oFfcY
-cslW5F0Pi2eTd8SgqwbW
-=fKL6
------END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.0.0_beta6.ebuild b/media-gfx/digikam/digikam-2.0.0_beta6.ebuild
new file mode 100644
index 0000000..be5c2a8
--- /dev/null
+++ b/media-gfx/digikam/digikam-2.0.0_beta6.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_LINGUAS=""
+#KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
+# ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
+
+KDE_HANDBOOK="optional"
+
+CMAKE_MIN_VERSION=2.8
+
+KDE_MINIMAL="4.6"
+
+KDEGRAPHICS_MINIMAL="4.6.30"
+# please leave the weird number here for the moment
+
+inherit kde4-base
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="A digital photo management application for KDE."
+HOMEPAGE="http://www.digikam.org/"
+[[ ${PV} != *9999* ]] && 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 semantic-desktop themedesigner +thumbnails video"
+
+CDEPEND="
+ $(add_kdebase_dep kdelibs semantic-desktop)
+ $(add_kdebase_dep marble plasma)
+ $(add_kdebase_dep libkipi)
+ $(add_kdebase_dep libkexiv2)
+ >=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL}
+ >=media-libs/libkface-${PV}
+ >=media-libs/libkmap-${PV}
+ $(add_kdebase_dep solid)
+ media-libs/jasper
+ virtual/jpeg
+ media-libs/lcms:0
+ >=media-libs/lensfun-0.2.5
+ media-libs/liblqr
+ media-libs/libpng
+ media-libs/tiff
+ media-libs/libpgf
+ >=media-plugins/kipi-plugins-1.2.0-r1
+ || ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas )
+ virtual/mysql
+ x11-libs/qt-gui[qt3support]
+ || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
+ addressbook? ( $(add_kdebase_dep kdepimlibs) )
+ gphoto2? ( media-libs/libgphoto2 )
+"
+RDEPEND="${CDEPEND}
+ $(add_kdebase_dep kreadconfig)
+ video? (
+ || (
+ $(add_kdebase_dep mplayerthumbs)
+ $(add_kdebase_dep ffmpegthumbs)
+ )
+ )
+"
+DEPEND="${CDEPEND}
+ sys-devel/gettext
+ doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${MY_P}/core"
+
+src_prepare() {
+ # just to make absolutely sure
+ rm -rf "${WORKDIR}/${MY_P}/extra" || die
+
+ mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
+ echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
+ echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
+
+ 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 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
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/
@ 2011-07-02 18:19 Andreas Hüttel
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Hüttel @ 2011-07-02 18:19 UTC (permalink / raw
To: gentoo-commits
commit: 66d92d6601abe44c5244f04adcc7a38489192304
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 2 18:03:38 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 2 18:03:38 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=66d92d66
Drop old
(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit)
---
media-gfx/digikam/ChangeLog | 4 +
media-gfx/digikam/Manifest | 4 +-
media-gfx/digikam/digikam-1.2.0-r4.ebuild | 126 -----------------------------
3 files changed, 5 insertions(+), 129 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index ac032cf..109f284 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 02 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ -digikam-1.2.0-r4.ebuild:
+ Drop old
+
*digikam-2.0.0_beta6 (02 Jul 2011)
02 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 2f1e18d..8a26a08 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -20,17 +20,15 @@ AUX digikam-1.9.0-turbo.patch 2265 RMD160 ecff0e0fa2ba6d51cdb6ec5bb90b41c3ed7310
AUX digikam-2.0.0_beta1-docs.patch 1361 RMD160 3b98a59e9790a7bc12dc5ec4723860d2cc968c4b SHA1 63d6d8c23126a198b91a56528cdfd97559f1f398 SHA256 dc8bf8aa8c6f956a5afd60bc0bc526872ed7b7604a3e1b8acb1613c947a5c97c
AUX digikam-2.0.0_beta4-docs.patch 1361 RMD160 0a68569608e99781708b5c242c90e0df6808a655 SHA1 d33c4ca548bd3f605d992ea32f287212ef68bd77 SHA256 9902322da1310bcf728d8172d5bbd53f7080555bfdd629dbe0eba069d9eec8ac
AUX digikam-2.0.0_beta5-docs.patch 1364 RMD160 e7e618d7ae5939328d43e1b41e11f6b4eb2f4821 SHA1 ff5519b3ee8cf19e091c1ac1b38817485921b7d2 SHA256 4113cc07a61d22a727f73fed917eb4ae82493f700673daf58acfcce455914964
-DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880853 SHA1 7f12caf737a05043c7a9a5291a448684e5a4e2e6 SHA256 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206
DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
DIST digikam-2.0.0-beta5.tar.bz2 43494127 RMD160 715f9f3f1695bad8e74dbeb9313da7a5303f0473 SHA1 97432e5997f00028c1acff38e2e0a791294c2aaf SHA256 118ea42cebaec6795b89cbb6018bdfa1d0e664eeda9b09ac0fd4083e3969f394
DIST digikam-2.0.0-beta6.tar.bz2 43533320 RMD160 eb50febc2ade359f8d92e6673e4f73a6b57b6fa5 SHA1 3ca5356da07d6484ce2299627e9d54acf14e06a2 SHA256 5f81ce581ff8e1148c023b71365928509d497f0bd248f27c925ea3038cea2cea
DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
-EBUILD digikam-1.2.0-r4.ebuild 3241 RMD160 97240d9bf66f91276583380abb44abcca32aef53 SHA1 541cb89174e630ede2a012f75576b1e66a7e5834 SHA256 7b99de04c49c27afc4047b49eb88558d34ab83cdddf272d3a282313f79e88c48
EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
EBUILD digikam-1.9.0-r1.ebuild 3299 RMD160 c4f0ffdc7d1bb89581c721a4a85310e7ca4b704f SHA1 1346318824da28a94445ebac446c737e46906dae SHA256 b73c19ab5cf8ecddec3802687b00e664e3fbc7b054a504173b540151e0c324f6
EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
EBUILD digikam-2.0.0_beta5.ebuild 3245 RMD160 cc3e08c7da4a3bd909edb43f6b33ad3aff64b762 SHA1 a8501a880d6cc3c9e22153fc8288908de09c1d2a SHA256 8b5dfd0865866bb01fcfe6d5055b798194ea6e3dfefa29821dac73dd997643bf
EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75
-MISC ChangeLog 10722 RMD160 2f317cc3ddb3c72cb3b2baa8fa18f129efde6c40 SHA1 b79a88ce00706eac870ef4d09d1f624d91578e52 SHA256 53633f404935588552bcbe0c9c40b68cfb2ed21b7a749021fbc8aacb1002c4ca
+MISC ChangeLog 10819 RMD160 7396d8ad78084f949d38c2f068fd9a3427a2961d SHA1 0237a2601b498d5c88e3a65fe9fde7fa8d059c52 SHA256 a19176aa98decddf9fc30e5198a19767dbcd8fa13e01779c4122dcfca5934218
MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
diff --git a/media-gfx/digikam/digikam-1.2.0-r4.ebuild b/media-gfx/digikam/digikam-1.2.0-r4.ebuild
deleted file mode 100644
index 29b34e7..0000000
--- a/media-gfx/digikam/digikam-1.2.0-r4.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.2.0-r4.ebuild,v 1.6 2011/02/27 11:55:04 dilfridge Exp $
-
-EAPI=3
-
-KDE_LINGUAS="ar be bg ca cs da de el es et eu fa fi fr ga gl he hi is it ja km
-ko lt lv lb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi zh_CN zh_TW"
-KMNAME="extragear/graphics"
-inherit kde4-base
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="A digital photo management application for KDE."
-HOMEPAGE="http://www.digikam.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
- handbook? ( mirror://gentoo/${PN}-doc-1.4.0.tar.bz2 )"
-
-LICENSE="GPL-2
- handbook? ( FDL-1.2 )"
-KEYWORDS="amd64 ~ppc x86"
-SLOT="4"
-IUSE="addressbook debug doc geolocation gphoto2 handbook lensfun semantic-desktop +thumbnails video"
-
-CDEPEND="
- >=kde-base/kdelibs-${KDE_MINIMAL}[semantic-desktop?]
- >=kde-base/libkdcraw-${KDE_MINIMAL}
- >=kde-base/libkexiv2-${KDE_MINIMAL}
- >=kde-base/libkipi-${KDE_MINIMAL}
- >=kde-base/solid-${KDE_MINIMAL}
- media-libs/jasper
- virtual/jpeg
- media-libs/lcms:0
- media-libs/liblqr
- media-libs/libpng
- media-libs/tiff
- media-libs/libpgf
- >=media-plugins/kipi-plugins-1.2.0-r1
- virtual/lapack
- x11-libs/qt-gui[qt3support]
- x11-libs/qt-sql[sqlite]
- addressbook? ( >=kde-base/kdepimlibs-${KDE_MINIMAL} )
- geolocation? ( >=kde-base/marble-${KDE_MINIMAL} )
- gphoto2? ( media-libs/libgphoto2 )
- lensfun? ( media-libs/lensfun )
- <kde-base/kdelibs-4.6
-"
-RDEPEND="${CDEPEND}
- >=kde-base/kreadconfig-${KDE_MINIMAL}
- video? (
- || (
- >=kde-base/mplayerthumbs-${KDE_MINIMAL}
- >=kde-base/ffmpegthumbs-${KDE_MINIMAL}
- )
- )
-"
-# gcc[fortran] is required since we cannot otherwise link to the lapack library
-# (the fun of unbundling)
-DEPEND="${CDEPEND}
- sys-devel/gcc[fortran]
- sys-devel/gettext
- doc? (
- app-doc/doxygen
- virtual/latex-base
- )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${P}"-{ratingwidget,libpgf-r3,docs-r3,lapack}.patch )
-
-src_prepare() {
- if use handbook; then
- mv "${WORKDIR}/${PN}"-1.4.0/* "${S}/" || die
- else
- mkdir doc || die
- echo > doc/CMakeLists.txt || die
- fi
-
- kde4-base_src_prepare
-}
-
-src_configure() {
- local backend
-
- use semantic-desktop && backend="Nepomuk" || backend="None"
- # LQR = only allows to choose between bundled/external
- mycmakeargs=(
- -DWITH_LQR=ON
- -DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
- $(cmake-utils_use_with addressbook KdepimLibs)
- $(cmake-utils_use_build doc)
- $(cmake-utils_use_with geolocation MarbleWidget)
- $(cmake-utils_use_enable gphoto2 GPHOTO2)
- $(cmake-utils_use_with gphoto2)
- $(cmake-utils_use_with lensfun LensFun)
- $(cmake-utils_use_with semantic-desktop Soprano)
- -DENABLE_THEMEDESIGNER=OFF
- $(cmake-utils_use_enable thumbnails THUMBS_DB)
- )
-
- kde4-base_src_configure
-}
-
-src_install() {
- kde4-base_src_install
-
- if use doc; then
- # install the api documentation
- dodir /usr/share/doc/${PF}/html || die
- insinto /usr/share/doc/${PF}/html
- doins -r ${CMAKE_BUILD_DIR}/api/html/* || die
- fi
-
- if use handbook; then
- dodoc readme-handbook.txt || die
- 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
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/
@ 2011-07-02 18:30 Andreas Hüttel
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Hüttel @ 2011-07-02 18:30 UTC (permalink / raw
To: gentoo-commits
commit: d6df2cca201ae2cb3a113aca6d074f8e26c055c3
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 2 18:30:45 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 2 18:30:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=d6df2cca
Version bump, does not build yet (kde bug 276969)
(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit)
---
media-gfx/digikam/ChangeLog | 6 ++
media-gfx/digikam/Manifest | 6 +-
media-gfx/digikam/digikam-2.0.0_rc.ebuild | 134 +++++++++++++++++++++++++++++
media-gfx/digikam/metadata.xml | 1 -
4 files changed, 144 insertions(+), 3 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 109f284..a6ca443 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*digikam-2.0.0_rc (02 Jul 2011)
+
+ 02 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ +digikam-2.0.0_rc.ebuild, metadata.xml:
+ Version bump, does not build yet (kde bug 276969)
+
02 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
-digikam-1.2.0-r4.ebuild:
Drop old
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 8a26a08..88551a0 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -24,11 +24,13 @@ DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc
DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
DIST digikam-2.0.0-beta5.tar.bz2 43494127 RMD160 715f9f3f1695bad8e74dbeb9313da7a5303f0473 SHA1 97432e5997f00028c1acff38e2e0a791294c2aaf SHA256 118ea42cebaec6795b89cbb6018bdfa1d0e664eeda9b09ac0fd4083e3969f394
DIST digikam-2.0.0-beta6.tar.bz2 43533320 RMD160 eb50febc2ade359f8d92e6673e4f73a6b57b6fa5 SHA1 3ca5356da07d6484ce2299627e9d54acf14e06a2 SHA256 5f81ce581ff8e1148c023b71365928509d497f0bd248f27c925ea3038cea2cea
+DIST digikam-2.0.0-rc.tar.bz2 45397480 RMD160 20fa3790c8ca950960020cdf3a32410689005db3 SHA1 b0067f99de1244723c45650d9a684b1e8f743954 SHA256 564354c34b41287e951005707b84b8a1f82c691189083c5943abed5e0aebe691
DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
EBUILD digikam-1.9.0-r1.ebuild 3299 RMD160 c4f0ffdc7d1bb89581c721a4a85310e7ca4b704f SHA1 1346318824da28a94445ebac446c737e46906dae SHA256 b73c19ab5cf8ecddec3802687b00e664e3fbc7b054a504173b540151e0c324f6
EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
EBUILD digikam-2.0.0_beta5.ebuild 3245 RMD160 cc3e08c7da4a3bd909edb43f6b33ad3aff64b762 SHA1 a8501a880d6cc3c9e22153fc8288908de09c1d2a SHA256 8b5dfd0865866bb01fcfe6d5055b798194ea6e3dfefa29821dac73dd997643bf
EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75
-MISC ChangeLog 10819 RMD160 7396d8ad78084f949d38c2f068fd9a3427a2961d SHA1 0237a2601b498d5c88e3a65fe9fde7fa8d059c52 SHA256 a19176aa98decddf9fc30e5198a19767dbcd8fa13e01779c4122dcfca5934218
-MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
+EBUILD digikam-2.0.0_rc.ebuild 3207 RMD160 1aeaf47f7a6c4980322bd699030b6ec8bd6360bd SHA1 a5cac00b9d468418cf340ed250416dad5d20fee1 SHA256 f529b966f33261732c072060dcbc3767d53de7665e1663440a9b3933bcd64a8f
+MISC ChangeLog 11004 RMD160 5e9edd169e242504366ee2f45bbe2f0f02d3657f SHA1 eb603e9e4ee3eb507a9520005dd889800809beeb SHA256 3ebb5b184f05fa323b682cac3d35b77a251762d1dc505341555c20b465f04483
+MISC metadata.xml 553 RMD160 7de4b2dc583e17cfab08965015c5bb6291b968d8 SHA1 c7eecc86fd6539448bc2a8296f77c2bc4796e3a1 SHA256 f3280886ea9f988ca1315148380f1c89c6c042d0bc511105f3b2c3a926e17b80
diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
new file mode 100644
index 0000000..8f062fe
--- /dev/null
+++ b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+KDE_LINGUAS=""
+#KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
+# ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
+
+KDE_HANDBOOK="optional"
+
+CMAKE_MIN_VERSION=2.8
+
+KDEGRAPHICS_MINIMAL="4.6.31"
+# please leave the weird number here for the moment
+
+inherit kde4-base
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="A digital photo management application for KDE."
+HOMEPAGE="http://www.digikam.org/"
+[[ ${PV} != *9999* ]] && 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 semantic-desktop themedesigner +thumbnails video"
+
+CDEPEND="
+ $(add_kdebase_dep kdelibs semantic-desktop)
+ $(add_kdebase_dep marble plasma)
+ $(add_kdebase_dep libkipi)
+ $(add_kdebase_dep libkexiv2)
+ >=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL}
+ >=media-libs/libkface-${PV}
+ >=media-libs/libkmap-${PV}
+ $(add_kdebase_dep solid)
+ media-libs/jasper
+ virtual/jpeg
+ media-libs/lcms:0
+ >=media-libs/lensfun-0.2.5
+ media-libs/liblqr
+ media-libs/libpng
+ media-libs/tiff
+ media-libs/libpgf
+ >=media-plugins/kipi-plugins-1.2.0-r1
+ || ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas )
+ virtual/mysql
+ x11-libs/qt-gui[qt3support]
+ || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
+ addressbook? ( $(add_kdebase_dep kdepimlibs) )
+ gphoto2? ( media-libs/libgphoto2 )
+"
+RDEPEND="${CDEPEND}
+ $(add_kdebase_dep kreadconfig)
+ video? (
+ || (
+ $(add_kdebase_dep mplayerthumbs)
+ $(add_kdebase_dep ffmpegthumbs)
+ )
+ )
+"
+DEPEND="${CDEPEND}
+ sys-devel/gettext
+ doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${MY_P}/core"
+
+src_prepare() {
+ # just to make absolutely sure
+ rm -rf "${WORKDIR}/${MY_P}/extra" || die
+
+ mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
+ echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
+ echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
+
+ 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 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/metadata.xml b/media-gfx/digikam/metadata.xml
index cf0f6e0..65589fb 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -6,7 +6,6 @@
<use>
<flag name="addressbook">Add support for kdepim</flag>
<flag name="geolocation">Add support for marble</flag>
- <flag name="lensfun">Enable support for lens-correnction library</flag>
<flag name="themedesigner">Build the digikam theme designer</flag>
<flag name="thumbnails">Enable thumbnails database support</flag>
<flag name="video">Pull in mplayerthumbs to enable video thumbnails</flag>
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/
@ 2011-07-06 18:58 Andreas Hüttel
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Hüttel @ 2011-07-06 18:58 UTC (permalink / raw
To: gentoo-commits
commit: 9029459b07e9eb98ddbff05daa8e1392aff9ddd1
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 6 18:59:00 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jul 6 18:59:00 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=9029459b
Although not strictly required, it is probably safer to use libpgf-6.11.24
(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit)
---
media-gfx/digikam/ChangeLog | 4 ++++
media-gfx/digikam/Manifest | 4 ++--
media-gfx/digikam/digikam-2.0.0_rc.ebuild | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 2e5d407..1a0a59a 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 06 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ digikam-2.0.0_rc.ebuild:
+ Although not strictly required, it is probably safer to use libpgf-6.11.24
+
05 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
digikam-2.0.0_rc.ebuild, +files/digikam-2.0.0_rc-officialpgf2.patch:
Additional compile fix for libpgf-6.11.24
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 4a34b5b..97e0382 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -34,6 +34,6 @@ EBUILD digikam-1.9.0-r1.ebuild 3299 RMD160 c4f0ffdc7d1bb89581c721a4a85310e7ca4b7
EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
EBUILD digikam-2.0.0_beta5.ebuild 3245 RMD160 cc3e08c7da4a3bd909edb43f6b33ad3aff64b762 SHA1 a8501a880d6cc3c9e22153fc8288908de09c1d2a SHA256 8b5dfd0865866bb01fcfe6d5055b798194ea6e3dfefa29821dac73dd997643bf
EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75
-EBUILD digikam-2.0.0_rc.ebuild 3360 RMD160 7148a6acb05d956ee209d77143511914c3703d09 SHA1 2a8d842f8315ef9b4247ae0522508ba183ceb22f SHA256 fc480aec87937847c41edd6902273bc085f912425dd5c72297ed6c7ed928896f
-MISC ChangeLog 11691 RMD160 e88fcaf22a616cd874070f46b7fff6a9c6efe19b SHA1 30f7d54168ee21281012d1c39d182b09aabed649 SHA256 f5e5e66b9c6f2ff2f3e9a743a3acc14826e169f3e15bd61deb8ee1a184a265c6
+EBUILD digikam-2.0.0_rc.ebuild 3370 RMD160 58668a86e9f0fa77cf9d9ea6a39917616e207912 SHA1 8e567e80d44070618bb46de55d75ca1160321f70 SHA256 ffd574d11ee097c8eb4e2eb05e67095c870741ccb0292ef2dca7d3795c7bcfc5
+MISC ChangeLog 11853 RMD160 6361e822cb4cdbde9002995d53ac87a20507d611 SHA1 2a683af8732dd884e3fab61d9af3720815ec5c23 SHA256 0c1e5476878ffcd0d82514cd3c10f44de389cee11dae9a62b73c195b05406f83
MISC metadata.xml 553 RMD160 7de4b2dc583e17cfab08965015c5bb6291b968d8 SHA1 c7eecc86fd6539448bc2a8296f77c2bc4796e3a1 SHA256 f3280886ea9f988ca1315148380f1c89c6c042d0bc511105f3b2c3a926e17b80
diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
index 61faba4..12bade4 100644
--- a/media-gfx/digikam/digikam-2.0.0_rc.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
@@ -45,7 +45,7 @@ CDEPEND="
media-libs/liblqr
media-libs/libpng
media-libs/tiff
- media-libs/libpgf
+ >=media-libs/libpgf-6.11.24
>=media-plugins/kipi-plugins-1.2.0-r1
|| ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas )
virtual/mysql
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/
@ 2011-07-27 20:31 Andreas Hüttel
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Hüttel @ 2011-07-27 20:31 UTC (permalink / raw
To: gentoo-commits
commit: 5e6cd56e804e8a55df713fe4c703335df3b98a24
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Wed Jul 27 20:31:10 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 20:31:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=5e6cd56e
Cleanup, re-add accidentally dropped useflag mysql, depend on kde-4.7
(Portage version: 2.1.10.7/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)
---
media-gfx/digikam/ChangeLog | 4 +++
media-gfx/digikam/Manifest | 24 +++++++++++++++++++++-
media-gfx/digikam/digikam-2.0.0_rc.ebuild | 30 +++++++++++++---------------
3 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 1a0a59a..a4bf127 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 27 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ digikam-2.0.0_rc.ebuild:
+ Cleanup, re-add accidentally dropped useflag mysql, depend on kde-4.7
+
06 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
digikam-2.0.0_rc.ebuild:
Although not strictly required, it is probably safer to use libpgf-6.11.24
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 97e0382..1deea89 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
AUX digikam-1.1.0-libpgf.patch 8996 RMD160 4f1a7ad7b28c43b3fe2e454eb3351f27a14bde6f SHA1 fd2b98e23c31d880a2a32f28161f279abef82c22 SHA256 f2001099ee5538a31a9660c223e59a25a19eb7c36a191831b849e1b81c58856d
AUX digikam-1.1.0-libpng14.patch 1580 RMD160 769e9bf4030d795349cb260854e26c189471ccbc SHA1 9b3123dad7bd7530db6833296dc1de7ec240fd54 SHA256 0ae5e279aedc80857cb27ace7d1609b6cf632853513445896b88a7365b763fb9
AUX digikam-1.2.0-docs-r3.patch 1926 RMD160 963f134c1bdb2e6b1a59b82efb7009733294ce6a SHA1 7cf403d5fd8f20142b7c1c6f6de225b5e66c28b9 SHA256 0687cd39780c1e40fec424f6ae5cce851e460681d02088eec763902c170ecb28
@@ -34,6 +37,23 @@ EBUILD digikam-1.9.0-r1.ebuild 3299 RMD160 c4f0ffdc7d1bb89581c721a4a85310e7ca4b7
EBUILD digikam-1.9.0.ebuild 3242 RMD160 04df3e2432a19d01a07851d8a8a3821279aa4af0 SHA1 c80b1939a52ab7aa7c0032373022f3cb931fee81 SHA256 e5bc2256f812d90206d99b3ec6f6ffbad75e5dd0bbcccaa8e349e894eef73d53
EBUILD digikam-2.0.0_beta5.ebuild 3245 RMD160 cc3e08c7da4a3bd909edb43f6b33ad3aff64b762 SHA1 a8501a880d6cc3c9e22153fc8288908de09c1d2a SHA256 8b5dfd0865866bb01fcfe6d5055b798194ea6e3dfefa29821dac73dd997643bf
EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75
-EBUILD digikam-2.0.0_rc.ebuild 3370 RMD160 58668a86e9f0fa77cf9d9ea6a39917616e207912 SHA1 8e567e80d44070618bb46de55d75ca1160321f70 SHA256 ffd574d11ee097c8eb4e2eb05e67095c870741ccb0292ef2dca7d3795c7bcfc5
-MISC ChangeLog 11853 RMD160 6361e822cb4cdbde9002995d53ac87a20507d611 SHA1 2a683af8732dd884e3fab61d9af3720815ec5c23 SHA256 0c1e5476878ffcd0d82514cd3c10f44de389cee11dae9a62b73c195b05406f83
+EBUILD digikam-2.0.0_rc.ebuild 3346 RMD160 be0115573261b514fa58148436c2c49c015c5826 SHA1 00b5733fbb44c4b345113749945cdc8c1d92cb96 SHA256 c49e09577600adad9478a9702a79f2003c99a132a22fee68ecc33b928e698111
+MISC ChangeLog 12010 RMD160 9ae712c69a3ad32799d2cc72d130bda5ee4fcc3c SHA1 363ad373e7411f9978cfba67cd1765ff1c596f8b SHA256 8376c41406c84a03ce41474a6d0db69d7512c59cd37bc9a0a04edb7ca9c93c43
MISC metadata.xml 553 RMD160 7de4b2dc583e17cfab08965015c5bb6291b968d8 SHA1 c7eecc86fd6539448bc2a8296f77c2bc4796e3a1 SHA256 f3280886ea9f988ca1315148380f1c89c6c042d0bc511105f3b2c3a926e17b80
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOMHWOAAoJENwGBM22xffeO84QAIp63v4ceC7fhc7ulFETs7fh
++hTa0NmQW3//A6idGCSXTinnpZcaFOVRf8ny0uKXuzSPJ1enN3FeQHRrdhttR2UM
+EsfhGN1Z7IMug1rzyk3d24xwf1mxAA2YCvFnZ4kVo813i/fGYIv52/isCDRrB0mC
+eL36N1+xdOgNIXCtsqHTfSnNLXjxPvuFH0fea2YTN25qCDZTEIEdwrDp4EIzMQQa
+XkcrwiaIAEdEqYRBOGsR1ncKm/T1Q4iK6SSUTq8Szmay+fxgZZuMLfVndrABgp4g
+7nWQkjj8CoU34ZC3LTBzQQJcnmSSWbug9UceU3tGJ6556T3jjwRCtdzk6yvN4e9r
+eWqpW7jaSs44J9GczO4jxhAUFkXLb/GrmO1NhL1EIrBqN/gWfeVlArQzb5BD4sQK
+xOw8PJLYaa6GwTzxvT68xzJxQ6TdMYTvypuqBM/1V/gXQeadS9miqdc53TC3sdMS
+ps9pp8pWr+P4+pSfWbUQGNZLOmG/Ml+c6bAy3ILpWd86rb/WM5E/HI3BBi56PQA5
+knUxDzCS9L47yIfOZhFWprYG8sFxmIJQ0VvxGL/UUkh40TOE7U4S9a1tlq/nuA5Q
+x4+oZ09npmNp7qHIUwmtTVyrb3r7FtqEMvnWA9eghUkxx0BYbB4I9Ta2XO+eJajU
+XqIAlP6OfYvXanby8cGl
+=P5KI
+-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.0.0_rc.ebuild b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
index 12bade4..d3834ff 100644
--- a/media-gfx/digikam/digikam-2.0.0_rc.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0_rc.ebuild
@@ -9,11 +9,8 @@ KDE_LINGUAS=""
# ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
KDE_HANDBOOK="optional"
-
-CMAKE_MIN_VERSION=2.8
-
-KDEGRAPHICS_MINIMAL="4.6.31"
-# please leave the weird number here for the moment
+CMAKE_MIN_VERSION="2.8"
+KDE_MINIMAL="4.7"
inherit kde4-base
@@ -27,32 +24,32 @@ LICENSE="GPL-2
handbook? ( FDL-1.2 )"
KEYWORDS="~amd64 ~x86"
SLOT="4"
-IUSE="addressbook debug doc gphoto2 semantic-desktop themedesigner +thumbnails video"
+IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
CDEPEND="
$(add_kdebase_dep kdelibs semantic-desktop)
- $(add_kdebase_dep marble plasma)
- $(add_kdebase_dep libkipi)
+ $(add_kdebase_dep libkdcraw)
$(add_kdebase_dep libkexiv2)
- >=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL}
- >=media-libs/libkface-${PV}
- >=media-libs/libkmap-${PV}
+ $(add_kdebase_dep libkipi)
+ $(add_kdebase_dep marble plasma)
$(add_kdebase_dep solid)
media-libs/jasper
- virtual/jpeg
media-libs/lcms:0
>=media-libs/lensfun-0.2.5
+ >=media-libs/libkface-${PV}
+ >=media-libs/libkmap-${PV}
media-libs/liblqr
+ >=media-libs/libpgf-6.11.24
media-libs/libpng
media-libs/tiff
- >=media-libs/libpgf-6.11.24
- >=media-plugins/kipi-plugins-1.2.0-r1
- || ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas )
- virtual/mysql
+ media-plugins/kipi-plugins
+ virtual/jpeg
x11-libs/qt-gui[qt3support]
+ || ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas )
|| ( 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)
@@ -108,6 +105,7 @@ src_configure() {
$(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)
)
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/
@ 2011-07-28 22:45 Andreas Hüttel
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Hüttel @ 2011-07-28 22:45 UTC (permalink / raw
To: gentoo-commits
commit: 0f7a080c42f1506a43bbf8e7d63967e3378e4948
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Thu Jul 28 22:45:19 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jul 28 22:45:19 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=0f7a080c
Added work in progess, does not build yet
(Portage version: 2.1.10.7/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)
---
media-gfx/digikam/ChangeLog | 7 +
media-gfx/digikam/Manifest | 34 +++---
...kam-2.0.0_beta6.ebuild => digikam-2.0.0.ebuild} | 52 ++++----
media-gfx/digikam/digikam-2.0.0_beta5.ebuild | 132 --------------------
4 files changed, 51 insertions(+), 174 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 51e1807..29166b6 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*digikam-2.0.0 (28 Jul 2011)
+
+ 28 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ -digikam-2.0.0_beta5.ebuild, -digikam-2.0.0_beta6.ebuild,
+ +digikam-2.0.0.ebuild:
+ Added work in progess, does not build yet
+
27 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org> digikam-1.9.0.ebuild,
digikam-1.9.0-r1.ebuild, +files/digikam-1.9.0-newpgf.patch,
digikam-2.0.0_rc.ebuild:
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 6b434ee..2e146d5 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -29,32 +29,30 @@ AUX digikam-2.0.0_rc-officialpgf2.patch 824 RMD160 54715604f3ca772253fee111f3110
AUX digikam-2.0.0_rc-oldpgf.patch 866 RMD160 36d94d476bdd02647fe4071b6ca2d9d09c851282 SHA1 3c49b420987df7db854a6a426daa848c42a36f3c SHA256 11389b36e669ae65522f439672d0409963f86eba0d2f439402311e67650dc89c
DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
-DIST digikam-2.0.0-beta5.tar.bz2 43494127 RMD160 715f9f3f1695bad8e74dbeb9313da7a5303f0473 SHA1 97432e5997f00028c1acff38e2e0a791294c2aaf SHA256 118ea42cebaec6795b89cbb6018bdfa1d0e664eeda9b09ac0fd4083e3969f394
-DIST digikam-2.0.0-beta6.tar.bz2 43533320 RMD160 eb50febc2ade359f8d92e6673e4f73a6b57b6fa5 SHA1 3ca5356da07d6484ce2299627e9d54acf14e06a2 SHA256 5f81ce581ff8e1148c023b71365928509d497f0bd248f27c925ea3038cea2cea
DIST digikam-2.0.0-rc.tar.bz2 45397480 RMD160 20fa3790c8ca950960020cdf3a32410689005db3 SHA1 b0067f99de1244723c45650d9a684b1e8f743954 SHA256 564354c34b41287e951005707b84b8a1f82c691189083c5943abed5e0aebe691
+DIST digikam-2.0.0.tar.bz2 53906557 RMD160 010f6b37920828003fa56159f1a7cf8452226fc6 SHA1 5941681163d90a13d316bd606589354099fd4f8a SHA256 c7d19f0562a06f02479cf84a257fe30aa523f82e668a16b21ce9ae5443034234
DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
EBUILD digikam-1.9.0-r1.ebuild 3347 RMD160 3cdaf055dc0b801a3cd05ce5ebd91a7db10ff819 SHA1 29390bef0da866f1f914ba05e046f15f78297d4e SHA256 2b83becdcae58d502d977afe0551abf24b80365bb42be54144444b969d7342e2
EBUILD digikam-1.9.0.ebuild 3178 RMD160 1f56c6f8cc4d7595dd751866f7a342974c0b67ea SHA1 e4193070e15b3851ff8fa2b6bb18ec48d3bfb0ac SHA256 b75d893953c1f37396f4f4b6a0c59005b4bf09307cb85aef958bc3910f3e9c75
-EBUILD digikam-2.0.0_beta5.ebuild 3245 RMD160 cc3e08c7da4a3bd909edb43f6b33ad3aff64b762 SHA1 a8501a880d6cc3c9e22153fc8288908de09c1d2a SHA256 8b5dfd0865866bb01fcfe6d5055b798194ea6e3dfefa29821dac73dd997643bf
-EBUILD digikam-2.0.0_beta6.ebuild 3226 RMD160 939ed0020e35608d4140e73b40f9266093c0e2a8 SHA1 6baad3fab16f5f406295f7e7e084e67e9c233e48 SHA256 b6ee9123131a9b97c984d7bfc05a9b69ce644083499702c0c18d394c5854ba75
+EBUILD digikam-2.0.0.ebuild 3615 RMD160 effa4c716dc295c077abb2316303909092a31c22 SHA1 8a1e48212e8fbfb2355fe4d93f68a4a7d4e26cfd SHA256 0eaa68b9a008bf8b222492854204d51a8ab6e7ea909d57c88a55f6b760180bc8
EBUILD digikam-2.0.0_rc.ebuild 3500 RMD160 34a75d9a7b3aea4e5065cfc94d1674672a9a5ce3 SHA1 17abcd6e5996cc57a83fee9f9b0088aeaf1f4054 SHA256 2254955af12fb79aebdaec5dbaa6c3fe8e747ce47c42c22f2067ddddbf37f89a
-MISC ChangeLog 12203 RMD160 dad8c089a58312af04a5df63bae02cf38af3209d SHA1 9558c98e432bc61204e9782d1fb9c4c050fccfe3 SHA256 4a85e9b0a2cbc911a6ee392c357d7d603bd2cb9b4095b125c14d1cb6921f9044
+MISC ChangeLog 12420 RMD160 a141058d391b2035ed86bf0c380e7a576ad8b027 SHA1 6e70d14f65f91b00b51ac9d3b9bd61d5485a0e48 SHA256 1f9671289485fd404433c9f2e583fbe5e63ab0626b64de3d54e88b13e6861d2b
MISC metadata.xml 553 RMD160 7de4b2dc583e17cfab08965015c5bb6291b968d8 SHA1 c7eecc86fd6539448bc2a8296f77c2bc4796e3a1 SHA256 f3280886ea9f988ca1315148380f1c89c6c042d0bc511105f3b2c3a926e17b80
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJOMInJAAoJENwGBM22xffeoecQAJ5dNaTo+foLdjZAnYQOqzAO
-ZemA7GnO/84v0P2YFJJfDaKMmhvy1YFl1fXZBHNk1Ivk10LJhMXKcSHpkwP8BDwp
-BOUVJqWIRVmBXNjsoNbwWG08P3zs4nkjWRPFBwYjuW2SOld3Kt0zZ2/2YqvkMaT9
-Pxgw9HAVmOFrBo+jiDU3lCGM+zaplUIBXuXf4Uz/RH8nCgBAtpQ4rsFDbBNgrPJh
-4NjgK/3qGJ9EUsLNQaPuynlrM0JqUajylrOEPMrI4ZqGG+o/KIDMTQTipkgVQAHq
-jVQMDptS0u3cGmArOOGTdv23PIPWVI9iqLoAE2jhS6M2t+JG54OqaNhh+zd9fEkb
-MlDAA0ISxdQeEj5tgpA/U2zv9W9WtH9TpN087OCc5ZXXlmN+36oWfGSw3eOdXdrZ
-e3Xfhgpbia/35/nmbxh/tpEfRBuMBGdsI/oZVToeQXqVRyfzX5hIhpvSIiUuKGz6
-NillqL7oSAUnNEAhi95ZTXtSMTyChkrVXV2kuDrN4SdRE3Wjwphdf2XR2pYwHrrB
-KFGwXwClNn6hmHVFh2Jvr2jrQUronIWlaXdun+w1F50Gv0CbDCl6KcLFM3zrjL60
-dFSr3s2ynmxaRH2Qgv73aL/BvPcz2pOaBaPuLIoAjwSjsvTRtA6w8Cmx2uPiJGK8
-yCtbfrJpTKyukhs4vo/f
-=feu8
+iQIcBAEBCgAGBQJOMeZ/AAoJENwGBM22xffeSrEP/jYRZKVsPWTNNuGLWzdaPX3M
+Y3l2t5YJ4VJOHX1X73wbduY1FGqj8SoGVbfEPDiS89ezfwREwFREf4c2AD7LlI4a
+AS1Z4ydewHhBryE9E4p/uXEOoDe8r2Cc0YghByTiOwh5wxjdC27Fg56D8yM2EBED
+H/b2YMEl3iqsgJKcuDp13o8aJNVk+UxROIW8TwJELxhPdlnWm/qu9SR1eWCS/+se
+MwuNYRLjf2zxT1tubNbCIyGjwLuz747C9kPKDtB97dzmJPKEMi1lvWf4Z34Zuohb
+UiVOeFY0SqhPYWbTsiFZcZfjt9jrXFF/rY35nzJpFuuvLkIoFQP91eomQNgjuWIN
+nU84vJUV3HGA1mqRKgXgCdJJkbpe2fdR/GVUg9A20GP8lbiHN9LqNPxOZhDHjO3E
++LvZ0kgdT4XM04jpikY8Mopq8Yl7i5PGlYE9nizEkEHmXpPZH6poT/NggGmKsDZg
+f+VX+Qk+OeleV7DVeut03a/VHkKfBWJewMdAfciLyH54B/KIhcFHvlpgoARryMJr
+MYQkNyiHNi+RZPLlDod/MJIQfgr0QopmVW5QgPIG+45mNR7V4GAyd0W+2sXEVcTy
+8wXxDdNKySdSXvkzdwIU/Ktjb4287qvF5Fz1NoSTe9LR/40gFlNnWAndfQaq+xY0
+meruCDTchw5qGtBnlFxt
+=gU0/
-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.0.0_beta6.ebuild b/media-gfx/digikam/digikam-2.0.0.ebuild
similarity index 72%
rename from media-gfx/digikam/digikam-2.0.0_beta6.ebuild
rename to media-gfx/digikam/digikam-2.0.0.ebuild
index be5c2a8..74034dd 100644
--- a/media-gfx/digikam/digikam-2.0.0_beta6.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0.ebuild
@@ -1,63 +1,59 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.0.0_rc.ebuild,v 1.1 2011/07/27 20:51:56 dilfridge Exp $
EAPI=4
-KDE_LINGUAS=""
-#KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
-# ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
+KDE_LINGUAS="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="optional"
-
-CMAKE_MIN_VERSION=2.8
-
-KDE_MINIMAL="4.6"
-
-KDEGRAPHICS_MINIMAL="4.6.30"
-# please leave the weird number here for the moment
+CMAKE_MIN_VERSION="2.8"
+KDE_MINIMAL="4.7"
inherit kde4-base
MY_P="${PN}-${PV/_/-}"
-DESCRIPTION="A digital photo management application for KDE."
+DESCRIPTION="Digital photo management application for KDE"
HOMEPAGE="http://www.digikam.org/"
[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
LICENSE="GPL-2
handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
SLOT="4"
-IUSE="addressbook debug doc gphoto2 semantic-desktop themedesigner +thumbnails video"
+IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
CDEPEND="
$(add_kdebase_dep kdelibs semantic-desktop)
- $(add_kdebase_dep marble plasma)
- $(add_kdebase_dep libkipi)
+ $(add_kdebase_dep libkdcraw)
$(add_kdebase_dep libkexiv2)
- >=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL}
- >=media-libs/libkface-${PV}
- >=media-libs/libkmap-${PV}
+ $(add_kdebase_dep libkipi)
+ $(add_kdebase_dep marble plasma)
$(add_kdebase_dep solid)
media-libs/jasper
- virtual/jpeg
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
- media-libs/libpgf
- >=media-plugins/kipi-plugins-1.2.0-r1
- || ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas )
- virtual/mysql
+ virtual/jpeg
x11-libs/qt-gui[qt3support]
+ || ( >=sci-libs/clapack-3.2.1-r6 sci-libs/lapack-atlas )
|| ( 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-${PV}
video? (
|| (
$(add_kdebase_dep mplayerthumbs)
@@ -76,10 +72,17 @@ 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 "kipiplugin_*.po" -exec rm {} +
+
+ echo "add_subdirectory( po )" >> CMakeLists.txt
+
kde4-base_src_prepare
if use handbook; then
@@ -104,6 +107,7 @@ src_configure() {
$(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)
)
diff --git a/media-gfx/digikam/digikam-2.0.0_beta5.ebuild b/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
deleted file mode 100644
index b8e43c9..0000000
--- a/media-gfx/digikam/digikam-2.0.0_beta5.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.6.0.ebuild,v 1.1 2010/11/25 20:30:29 dilfridge Exp $
-
-EAPI=4
-
-KDE_LINGUAS=""
-#KDE_LINGUAS="be ca ca@valencia de el en_GB eo es et eu fi fr he hi hne hu is it km
-# ko lt lv nds nn pa pl pt pt_BR ro se sl sv th tr vi zh_CN zh_TW"
-
-KDE_HANDBOOK="optional"
-
-CMAKE_MIN_VERSION=2.8
-
-KDE_MINIMAL="4.6"
-KDEGRAPHICS_MINIMAL="4.6.29"
-
-inherit kde4-base
-
-MY_P="${PN}-${PV/_/-}"
-
-DESCRIPTION="A digital photo management application for KDE."
-HOMEPAGE="http://www.digikam.org/"
-[[ ${PV} != *9999* ]] && 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 semantic-desktop themedesigner +thumbnails video"
-
-CDEPEND="
- $(add_kdebase_dep kdelibs semantic-desktop)
- $(add_kdebase_dep marble plasma)
- $(add_kdebase_dep libkipi)
- $(add_kdebase_dep libkexiv2)
- >=kde-base/libkdcraw-${KDEGRAPHICS_MINIMAL}
- >=media-libs/libkface-${PV}
- >=media-libs/libkmap-${PV}
- $(add_kdebase_dep solid)
- media-libs/jasper
- virtual/jpeg
- media-libs/lcms:0
- >=media-libs/lensfun-0.2.5
- media-libs/liblqr
- media-libs/libpng
- media-libs/tiff
- media-libs/libpgf
- >=media-plugins/kipi-plugins-1.2.0-r1
- || ( >=sci-libs/clapack-3.2.1-r3 sci-libs/lapack-atlas )
- virtual/mysql
- x11-libs/qt-gui[qt3support]
- || ( x11-libs/qt-sql[mysql] x11-libs/qt-sql[sqlite] )
- addressbook? ( $(add_kdebase_dep kdepimlibs) )
- gphoto2? ( media-libs/libgphoto2 )
-"
-RDEPEND="${CDEPEND}
- $(add_kdebase_dep kreadconfig)
- video? (
- || (
- $(add_kdebase_dep mplayerthumbs)
- $(add_kdebase_dep ffmpegthumbs)
- )
- )
-"
-DEPEND="${CDEPEND}
- sys-devel/gettext
- doc? ( app-doc/doxygen )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}"-2.0.0_beta5-docs.patch
- "${FILESDIR}/${PN}"-1.9.0-turbo.patch
-)
-
-S="${WORKDIR}/${MY_P}/core"
-
-src_prepare() {
- # just to make absolutely sure
- rm -rf "${WORKDIR}/${MY_P}/extra" || die
-
- mv "${WORKDIR}/${MY_P}/doc/${PN}" doc || die
- echo "add_subdirectory( digikam )" > doc/CMakeLists.txt
- echo "add_subdirectory( showfoto )" >> doc/CMakeLists.txt
-
- 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)
- $(cmake-utils_use_build doc)
- -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)
- )
-
- kde4-base_src_configure
-}
-
-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
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/
@ 2011-07-29 10:35 Andreas Hüttel
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Hüttel @ 2011-07-29 10:35 UTC (permalink / raw
To: gentoo-commits
commit: 4a62e6833eb6e38826d423151b06351a6c3f4dea
Author: Andreas K. Huettel <andreas.huettel <AT> physik <DOT> uni-r <DOT> de>
AuthorDate: Fri Jul 29 10:29:12 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 10:29:12 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=4a62e683
Finished for testint
(Portage version: 2.1.10.7/git/Linux x86_64, signed Manifest commit with key 7887F787)
---
media-gfx/digikam/ChangeLog | 4 ++++
media-gfx/digikam/Manifest | 32 ++++++++++++++++----------------
media-gfx/digikam/digikam-2.0.0.ebuild | 10 +++++-----
media-gfx/digikam/metadata.xml | 4 ++++
4 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 29166b6..b6a2ada 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 29 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org> digikam-2.0.0.ebuild,
+ metadata.xml:
+ Finished for testing
+
*digikam-2.0.0 (28 Jul 2011)
28 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 2e146d5..313f8ea 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -35,24 +35,24 @@ DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf13
EBUILD digikam-1.8.0.ebuild 3247 RMD160 86c84f6dea0b55764dad9cf4c6427b1b2fbc7742 SHA1 4ea44c2e1e30d7dfdb28bbeb8defbd740199fad9 SHA256 b93cb62a5f973e48ec99716183ee339dcd0c90791594a982b6d70bd216a425c4
EBUILD digikam-1.9.0-r1.ebuild 3347 RMD160 3cdaf055dc0b801a3cd05ce5ebd91a7db10ff819 SHA1 29390bef0da866f1f914ba05e046f15f78297d4e SHA256 2b83becdcae58d502d977afe0551abf24b80365bb42be54144444b969d7342e2
EBUILD digikam-1.9.0.ebuild 3178 RMD160 1f56c6f8cc4d7595dd751866f7a342974c0b67ea SHA1 e4193070e15b3851ff8fa2b6bb18ec48d3bfb0ac SHA256 b75d893953c1f37396f4f4b6a0c59005b4bf09307cb85aef958bc3910f3e9c75
-EBUILD digikam-2.0.0.ebuild 3615 RMD160 effa4c716dc295c077abb2316303909092a31c22 SHA1 8a1e48212e8fbfb2355fe4d93f68a4a7d4e26cfd SHA256 0eaa68b9a008bf8b222492854204d51a8ab6e7ea909d57c88a55f6b760180bc8
+EBUILD digikam-2.0.0.ebuild 3616 RMD160 10830e6642d54e9438a172f662b83cd6f3e1dd97 SHA1 97d2aead3d64120088b86657c260806ac7c7e5da SHA256 574945446a4426360c4fe5e6598e03fe61feea0eea2ea76a4c7f8f20742e1f49
EBUILD digikam-2.0.0_rc.ebuild 3500 RMD160 34a75d9a7b3aea4e5065cfc94d1674672a9a5ce3 SHA1 17abcd6e5996cc57a83fee9f9b0088aeaf1f4054 SHA256 2254955af12fb79aebdaec5dbaa6c3fe8e747ce47c42c22f2067ddddbf37f89a
-MISC ChangeLog 12420 RMD160 a141058d391b2035ed86bf0c380e7a576ad8b027 SHA1 6e70d14f65f91b00b51ac9d3b9bd61d5485a0e48 SHA256 1f9671289485fd404433c9f2e583fbe5e63ab0626b64de3d54e88b13e6861d2b
-MISC metadata.xml 553 RMD160 7de4b2dc583e17cfab08965015c5bb6291b968d8 SHA1 c7eecc86fd6539448bc2a8296f77c2bc4796e3a1 SHA256 f3280886ea9f988ca1315148380f1c89c6c042d0bc511105f3b2c3a926e17b80
+MISC ChangeLog 12539 RMD160 4e62c096a9cfca3dba63c5b50bc7b3b7fc467994 SHA1 48e665e87f787aace2ba417c8e1e6290503a2064 SHA256 db71a82aa54bd1e9370fee3da6f48e9fdc980117539d1ffbbefaac5017071e40
+MISC metadata.xml 751 RMD160 b65e7816a03a284f440d296c1853aa913105129a SHA1 c6bf2cf0d471e4d4ffdbb5185889a0e9cd65af39 SHA256 4b8eced4b0649dc935acffac97119bb70862bebd51a686b32778745b407eb0cb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJOMeZ/AAoJENwGBM22xffeSrEP/jYRZKVsPWTNNuGLWzdaPX3M
-Y3l2t5YJ4VJOHX1X73wbduY1FGqj8SoGVbfEPDiS89ezfwREwFREf4c2AD7LlI4a
-AS1Z4ydewHhBryE9E4p/uXEOoDe8r2Cc0YghByTiOwh5wxjdC27Fg56D8yM2EBED
-H/b2YMEl3iqsgJKcuDp13o8aJNVk+UxROIW8TwJELxhPdlnWm/qu9SR1eWCS/+se
-MwuNYRLjf2zxT1tubNbCIyGjwLuz747C9kPKDtB97dzmJPKEMi1lvWf4Z34Zuohb
-UiVOeFY0SqhPYWbTsiFZcZfjt9jrXFF/rY35nzJpFuuvLkIoFQP91eomQNgjuWIN
-nU84vJUV3HGA1mqRKgXgCdJJkbpe2fdR/GVUg9A20GP8lbiHN9LqNPxOZhDHjO3E
-+LvZ0kgdT4XM04jpikY8Mopq8Yl7i5PGlYE9nizEkEHmXpPZH6poT/NggGmKsDZg
-f+VX+Qk+OeleV7DVeut03a/VHkKfBWJewMdAfciLyH54B/KIhcFHvlpgoARryMJr
-MYQkNyiHNi+RZPLlDod/MJIQfgr0QopmVW5QgPIG+45mNR7V4GAyd0W+2sXEVcTy
-8wXxDdNKySdSXvkzdwIU/Ktjb4287qvF5Fz1NoSTe9LR/40gFlNnWAndfQaq+xY0
-meruCDTchw5qGtBnlFxt
-=gU0/
+iQIcBAEBCgAGBQJOMot4AAoJEEb+UGWnxTyHRoYP/1eAmo0/jXC8YVFVZos1bpU4
+8eM0oUArsHkR/v26T1mJB+a9D+CgkP9fLO0OvQsg2LUgc0JjCXxG+9t9LZb1wKA3
+C9OF9vt7XSYccVtyT63p1R9uslhvLWiKiJLLmZt19AxqtMLDiaZy6xF7czBO1Hi4
+yXCYzTfn74hW3qHsaj/26Fh29J/3eD7qq5f4Zli1tE6bcaTGAAAs5eJZ+t63ChxU
+ieK/IWM6Nw7wA01U+kvqLIxVl7SdZVFu5IMVAKj/aIVTybIUHexCR+7NZKsV/8Kl
+FuyvRKe7zqg4Txwprb1ay9xxzr04oj5h13S6yjKQZYuzQ7X8jCMLx/KRdrvhpomv
+FihdYFmmDFpBlCscGoAvMjdLP2G9HyeXIe1ixzNxEV69b5xoXUOqg0cXkNjQUOdT
+EAFb1Z0934Xe804lqBZy1enn+crz02/0IGvnbCSfGvr+PSjz8Y8X20BpfbtUqkQb
+1CLnncbZNGy7IJAnVsocE4D4Gk8tBISSo3NmSYQsjAF+D2MqphC52U7SXmlkP1SQ
+LP3HnJH62vHvsb13WyZnAlYmYf1jkyr3m0v5F1LkXbHwDI31z0xC/HPeBxqNWTnF
+vm0TNAdDaHNhSthVugP8Mk6tGD5J09txMGI/NIROSjjJ6Cu+ysIKIvaROMfZcCgh
+52aEbnSUVNe16zwIgArv
+=g+MZ
-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.0.0.ebuild b/media-gfx/digikam/digikam-2.0.0.ebuild
index 74034dd..321f140 100644
--- a/media-gfx/digikam/digikam-2.0.0.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0.ebuild
@@ -4,9 +4,9 @@
EAPI=4
-KDE_LINGUAS="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
+KDE_LINGUAS="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="optional"
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.digikam.org/"
LICENSE="GPL-2
handbook? ( FDL-1.2 )"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
SLOT="4"
IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
@@ -53,7 +53,7 @@ CDEPEND="
"
RDEPEND="${CDEPEND}
$(add_kdebase_dep kreadconfig)
- ~media-plugins/kipi-plugins-${PV}
+ media-plugins/kipi-plugins
video? (
|| (
$(add_kdebase_dep mplayerthumbs)
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 65589fb..032404f 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -9,5 +9,9 @@
<flag name="themedesigner">Build the digikam theme designer</flag>
<flag name="thumbnails">Enable thumbnails database support</flag>
<flag name="video">Pull in mplayerthumbs to enable video thumbnails</flag>
+ <flag name="linguas_ha">Hausa translation</flag>
+ <flag name="linguas_mi">Maori translation</flag>
+ <flag name="linguas_tt">?? translation</flag>
+ <flag name="linguas_ven">Venda translation</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/
@ 2012-04-08 15:40 Andreas Hüttel
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Hüttel @ 2012-04-08 15:40 UTC (permalink / raw
To: gentoo-commits
commit: 90efe83e93433f439eb9ec7eacad614138dae264
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Apr 8 14:58:30 2012 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Apr 8 14:58:30 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=90efe83e
[media-gfx/digikam] Remove old
(Portage version: 2.1.10.56/git/Linux x86_64, RepoMan options: --force, signed 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
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.3.0.tar.bz2 54522109 RMD160 304bce5841f5d36a72a064784c90c91960c9a7c3 SHA1 15b8b16d7cce6ac50fb958d30166214f2f2b83ee SHA256 29ddf83a160817314e9274a35d678678da58006e41d961dcebc6afb0ab200a33
-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
-EBUILD digikam-2.3.0.ebuild 4045 RMD160 69f49da4f45b4338dab884fa09a1d03c728863cc SHA1 d8673baceb9692057a6811e23fc9d872eb50d332 SHA256 6f14cd55caba84399ab6ca0f5b5539f7d8a553477e28644e42160b3ea6a49e17
-EBUILD digikam-2.4.1.ebuild 3779 RMD160 ae3417da8b3dd7720e8099458b1ab5cf2835b1a2 SHA1 c29f3d4c178699a85a045ce7fdf485b8afe9ca60 SHA256 67177511b82432bb24096be539428a8a7b0160aa513c69039ed6388fde790dae
EBUILD digikam-2.5.0.ebuild 4197 RMD160 cd406b2bab0a40c52ed6a03aa36764b226406aa6 SHA1 cee756c8a06606acfd79379c085fc32e1c41789a SHA256 844f1cd90ed191aa990c483a76e8951d8968b0d3cab4c1f244ac114f861f21ac
MISC metadata.xml 648 RMD160 7694bc7a07e2b35c60e2ed22981007ba0680dd1f SHA1 15b78b8dee48c87b702a5705009b3eee46aa7ebd SHA256 fed8bb77a841bcbc558e06fbe5f729a616152051924fa17fed0e527237f09f8c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-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
-=mj0p
+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
+=/1AA
-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.3.0.ebuild b/media-gfx/digikam/digikam-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.ebuild,v 1.5 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="
- !!=media-gfx/digikam-2.1.0-r1
- $(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
-
- # 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/doc/${PF}/html"
- fi
-}
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 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.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
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/
@ 2012-04-08 15:40 Andreas Hüttel
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Hüttel @ 2012-04-08 15:40 UTC (permalink / raw
To: gentoo-commits
commit: 93144f9f3f00f589fdaacfe9ac5a4246d3e19052
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Apr 8 15:39:36 2012 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Apr 8 15:39:36 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=93144f9f
[media-gfx/digikam] Version bump
(Portage version: 2.1.10.56/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
media-gfx/digikam/Manifest | 28 +++---
media-gfx/digikam/digikam-2.6.0_beta3.ebuild | 151 ++++++++++++++++++++++++++
2 files changed, 166 insertions(+), 13 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 4a23123..7267d9f 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -4,22 +4,24 @@ 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.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
EBUILD digikam-2.5.0.ebuild 4197 RMD160 cd406b2bab0a40c52ed6a03aa36764b226406aa6 SHA1 cee756c8a06606acfd79379c085fc32e1c41789a SHA256 844f1cd90ed191aa990c483a76e8951d8968b0d3cab4c1f244ac114f861f21ac
+EBUILD digikam-2.6.0_beta3.ebuild 4100 RMD160 50b5bd3fe722057bff72fd1db3cf9e341a868b28 SHA1 7cc17bc9bed640a85fc5e1a38d83bdd3e357b16e SHA256 1b20f2998b83d1ef67b301a3e219080e578641ae74c97b4a001df09760456575
MISC metadata.xml 648 RMD160 7694bc7a07e2b35c60e2ed22981007ba0680dd1f SHA1 15b78b8dee48c87b702a5705009b3eee46aa7ebd SHA256 fed8bb77a841bcbc558e06fbe5f729a616152051924fa17fed0e527237f09f8c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-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
-=/1AA
+iQIcBAEBCgAGBQJPgbE4AAoJENwGBM22xffeydoQAKJMPNwlKcvC/YkpxahcUDEX
+/cBsX+9ZU1gKzjg1GRwhLSfWrtLwPmVrYaklyko/+xToTdhVfFoe9NoXNyZq8gse
+2ODP0GiitfC++BkciPQaeA7POo8dVhG1fMCKq3hsZmNvw8EdTfrwpLI4rDa+GU7Y
+5VzOMn2+7SeitmcVCB/9w5qpsKQEg+yIkoAHjeYmZAWSMhs6mPY3RUIWr8p1LCdy
+MjR4X88gEFCH8PWhe7fQFDWDAiS8m7owtTEtlgPVGahR0Q210PgjXPl4wt7YKymp
+dU8i04NCb6YrVHaSrCBg2Soi1cIVYKu3Lq2l/V733BqEU5XIUXBNOYF+w93EzJgp
+lEE6MVWT6TVkf8+eDd76WFdmKruQV6gQ9cTZonf+WgpC/CQ8XyaVnpJFUsOSgJjL
+dO944na7EQ85OcFvCAVcuLh1fOUecFLVK4a1hd/SA68MEGgcntxVRsbWi7Ss6E4o
+bmLaoADBn5leIqOfkZ21thLre/6w/VdknlMxMeKSPwclSAzh3ZAX7+qcRSB6Mqs6
+/OYJqRrXprKaTbXF9CV13ZcN+kpVctmsblndVFfkWRdFhXCqKvbnI+tue+BGwpP0
+0CvpHJhet3WeHSYNo7cAp9oS33seCSKh4K41liIrD/aJioFWFDS8MkUw492jgXlf
+p2+sdxjOd/s4oPGtEMxh
+=lhnf
-----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.6.0_beta3.ebuild b/media-gfx/digikam/digikam-2.6.0_beta3.ebuild
new file mode 100644
index 0000000..f92a6d3
--- /dev/null
+++ b/media-gfx/digikam/digikam-2.6.0_beta3.ebuild
@@ -0,0 +1,151 @@
+# 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.5.0.ebuild,v 1.5 2012/04/04 19:30:58 ago 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_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
+ media-libs/libkgeomap
+ 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
+ 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
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/
@ 2012-04-08 17:13 Andreas Hüttel
0 siblings, 0 replies; 17+ messages in thread
From: Andreas Hüttel @ 2012-04-08 17:13 UTC (permalink / raw
To: gentoo-commits
commit: 324cfe2b7ab7ec1081f6dc442836cccb6e76327b
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Apr 8 17:13:21 2012 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Apr 8 17:13:21 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=324cfe2b
[media-gfx/digikam] Remove keywords in beta
(Portage version: 2.1.10.56/git/Linux x86_64, unsigned Manifest commit)
---
media-gfx/digikam/Manifest | 29 +------------------------
media-gfx/digikam/digikam-2.6.0_beta3.ebuild | 2 +-
2 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 7267d9f..b9d49f5 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,27 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-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.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
-EBUILD digikam-2.5.0.ebuild 4197 RMD160 cd406b2bab0a40c52ed6a03aa36764b226406aa6 SHA1 cee756c8a06606acfd79379c085fc32e1c41789a SHA256 844f1cd90ed191aa990c483a76e8951d8968b0d3cab4c1f244ac114f861f21ac
-EBUILD digikam-2.6.0_beta3.ebuild 4100 RMD160 50b5bd3fe722057bff72fd1db3cf9e341a868b28 SHA1 7cc17bc9bed640a85fc5e1a38d83bdd3e357b16e SHA256 1b20f2998b83d1ef67b301a3e219080e578641ae74c97b4a001df09760456575
-MISC metadata.xml 648 RMD160 7694bc7a07e2b35c60e2ed22981007ba0680dd1f SHA1 15b78b8dee48c87b702a5705009b3eee46aa7ebd SHA256 fed8bb77a841bcbc558e06fbe5f729a616152051924fa17fed0e527237f09f8c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJPgbE4AAoJENwGBM22xffeydoQAKJMPNwlKcvC/YkpxahcUDEX
-/cBsX+9ZU1gKzjg1GRwhLSfWrtLwPmVrYaklyko/+xToTdhVfFoe9NoXNyZq8gse
-2ODP0GiitfC++BkciPQaeA7POo8dVhG1fMCKq3hsZmNvw8EdTfrwpLI4rDa+GU7Y
-5VzOMn2+7SeitmcVCB/9w5qpsKQEg+yIkoAHjeYmZAWSMhs6mPY3RUIWr8p1LCdy
-MjR4X88gEFCH8PWhe7fQFDWDAiS8m7owtTEtlgPVGahR0Q210PgjXPl4wt7YKymp
-dU8i04NCb6YrVHaSrCBg2Soi1cIVYKu3Lq2l/V733BqEU5XIUXBNOYF+w93EzJgp
-lEE6MVWT6TVkf8+eDd76WFdmKruQV6gQ9cTZonf+WgpC/CQ8XyaVnpJFUsOSgJjL
-dO944na7EQ85OcFvCAVcuLh1fOUecFLVK4a1hd/SA68MEGgcntxVRsbWi7Ss6E4o
-bmLaoADBn5leIqOfkZ21thLre/6w/VdknlMxMeKSPwclSAzh3ZAX7+qcRSB6Mqs6
-/OYJqRrXprKaTbXF9CV13ZcN+kpVctmsblndVFfkWRdFhXCqKvbnI+tue+BGwpP0
-0CvpHJhet3WeHSYNo7cAp9oS33seCSKh4K41liIrD/aJioFWFDS8MkUw492jgXlf
-p2+sdxjOd/s4oPGtEMxh
-=lhnf
------END PGP SIGNATURE-----
+DIST digikam-2.5.0.tar.bz2 54976375 SHA256 55292c79b41fd2c20ce0a821f388645436acb18b3b06b486747e17129114851a SHA512 e3d500e7719c059a425d77a09005906361fee8ea584002b172393e6156e0d79d5c59a2498e84329b5e42e92dda2850a76c636524392a113a489207b57d0b7ee7 WHIRLPOOL 8dfa904ab5cf2a7b082cd73ad8f02ffed2c72e2d3542b9994c29417a77ddd7a749d075475200ec1a5a3fa21262deac6a7f35503ab269e689eea37011a319b064
+DIST digikam-2.6.0-beta3.tar.bz2 55694232 SHA256 697ab7fdc0aff0a2a842df21608158f2abd1f7a4619cae9818749012267e6fec SHA512 ab820f20e0a405b524270825580d01d1658decd3387f23368b17f871984515a9a97b8b65414a707785de2c90b1db2e1fea1b00809a0c045f52df978a7b85a8fa WHIRLPOOL 3602a0307c02daddee6c7af198da3e2c9236a13aed2d3f7a2b477786991b4a011462ef97cd5e64fdf8ef76463425cb5a376b52da0a8a547a33b95081bda60141
diff --git a/media-gfx/digikam/digikam-2.6.0_beta3.ebuild b/media-gfx/digikam/digikam-2.6.0_beta3.ebuild
index f92a6d3..9c75483 100644
--- a/media-gfx/digikam/digikam-2.6.0_beta3.ebuild
+++ b/media-gfx/digikam/digikam-2.6.0_beta3.ebuild
@@ -24,7 +24,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
LICENSE="GPL-2
handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
SLOT="4"
IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video"
^ permalink raw reply related [flat|nested] 17+ messages in thread
end of thread, other threads:[~2012-04-08 17:14 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-08 15:40 [gentoo-commits] dev/dilfridge:master commit in: media-gfx/digikam/ Andreas Hüttel
-- strict thread matches above, loose matches on Subject: below --
2012-04-08 17:13 Andreas Hüttel
2012-04-08 15:40 Andreas Hüttel
2011-07-29 10:35 Andreas Hüttel
2011-07-28 22:45 Andreas Hüttel
2011-07-27 20:31 Andreas Hüttel
2011-07-06 18:58 Andreas Hüttel
2011-07-02 18:30 Andreas Hüttel
2011-07-02 18:19 Andreas Hüttel
2011-07-02 18:19 Andreas Hüttel
2011-05-20 22:57 Andreas K. Huettel
2011-05-20 22:25 Andreas K. Huettel
2011-05-11 20:46 Andreas K. Huettel
2011-05-11 20:46 Andreas K. Huettel
2011-04-11 22:14 Andreas K. Huettel
2011-03-01 20:22 Andreas K. Huettel
2011-02-28 23:10 Andreas K. Huettel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox