From: Andreas Hüttel Date: Sun, 11 Sep 2011 18:47:50 +0000 (+0000) Subject: Add version that corresponds to the tag v2.1.0, not the broken release tarball. WARNI... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c912626c4da956827d83d38d934889077cb80b7c;p=gentoo.git Add version that corresponds to the tag v2.1.0, not the broken release tarball. WARNING: you cannot upgrade from -r1 to -r2!!! Removing keywords from -r1, lets hope not too many people installed it. Package-Manager: portage-2.1.10.14/cvs/Linux x86_64 --- diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog index 1b167b5d4cb0..99b645da80c1 100644 --- a/media-gfx/digikam/ChangeLog +++ b/media-gfx/digikam/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-gfx/digikam # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.196 2011/09/11 18:11:10 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.197 2011/09/11 18:47:50 dilfridge Exp $ + +*digikam-2.1.0-r2 (11 Sep 2011) + + 11 Sep 2011; Andreas K. Huettel + digikam-2.1.0-r1.ebuild, +digikam-2.1.0-r2.ebuild: + Add version that corresponds to the tag v2.1.0, not the broken release + tarball. WARNING: you cannot upgrade from -r1 to -r2!!! Removing keywords + from -r1, lets hope not too many people installed it. 11 Sep 2011; Andreas K. Huettel digikam-2.1.0-r1.ebuild: diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index a581994b03af..fbe65ffb6d4c 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -10,28 +10,30 @@ AUX digikam-2.0.0-tests-1.patch 1880 RMD160 8961d7cd5cc31469da1e0d338f05b56c0c90 AUX digikam-2.0.0-underlinking.patch 843 RMD160 c13b49b2703cd3940743fa7f7555510cc04e5568 SHA1 1954ab4b923246f74b225fc5fb1a9ae31536657a SHA256 3d3fbaf8aa006e4f2aea0d258457c7103d3c5c009687a1f2558dc8b6dcb0c514 DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5 DIST digikam-2.0.0.tar.bz2 53906557 RMD160 010f6b37920828003fa56159f1a7cf8452226fc6 SHA1 5941681163d90a13d316bd606589354099fd4f8a SHA256 c7d19f0562a06f02479cf84a257fe30aa523f82e668a16b21ce9ae5443034234 +DIST digikam-2.1.0-tag.patch.bz2 30256 RMD160 4721a4b79878afa9df7277d49617d13d95884360 SHA1 8a4b1b6d81ea73c9d52750363f6e672f0e4921bb SHA256 070837e38af31bd74c979ee8df33b797f83edda18e94e1ff6704c7d7fb0dd4d8 DIST digikam-2.1.0.tar.bz2 53911470 RMD160 034f967a851f6cd748beb0c05e5fbe7d91526fe1 SHA1 4a5477a5665fea4cfaf0b2038a9ffcf2b2d207c7 SHA256 33b35c85b3f7820771a05f4a4e3f22961bbab6402e5159d07c2080158d55cba7 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467 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-r1.ebuild 3733 RMD160 9412cc5c539d304ba2252dc30df950262dc90cc9 SHA1 6550eea307e7cfe3a99e660bec573171456b394d SHA256 c80ad678226847aa563d63d5a151fb9880f99530892c699827ec0f7ec8306cb5 -EBUILD digikam-2.1.0-r1.ebuild 3853 RMD160 b98a8059d0d1f32cd664908c7b22edaf7404c9e5 SHA1 b372c5c7064b576a8891e37e00b0358fc3456f2a SHA256 d7f5a3d545dbdae772e9fd8ccd3ca89ef26cb56cea0386ae49b7c150c7dce28c -MISC ChangeLog 33147 RMD160 3b78f1a8d14f8726cd9cc5346e826e1b63a65a1b SHA1 09c87281eb93ec54a7984226d0b161db4a914a23 SHA256 6230228819744d775149222b7ac0b3b0afc10479057ef08300f8c8b7262d6016 +EBUILD digikam-2.1.0-r1.ebuild 3842 RMD160 6920835c71cc2e9379a80e28aac56067fb36ce60 SHA1 1e31b79f52e3e0d46d2fcea26bd439572b28704c SHA256 f4303f378696b38c8586302f63839a7a54de64a20b2e08ae2db9e641786bf73f +EBUILD digikam-2.1.0-r2.ebuild 3960 RMD160 cc1a2767163b17be922137797f503ac3c64dd828 SHA1 445658293ea9569c4e38fba2bfad166d9d25bbcb SHA256 ee3516372b38ca7952248af90f0f1774a09f4fe7602b091eb3a5b549432953b5 +MISC ChangeLog 33496 RMD160 64013bcab14d44890def29a270edbda865700f8e SHA1 061bde558fd6e82ae2d8031363f4bc0b603a1f3e SHA256 aab52f6739b77e62cfde0f35bd5309f668fc4492922d6dcaffaae90f479424aa MISC metadata.xml 751 RMD160 b65e7816a03a284f440d296c1853aa913105129a SHA1 c6bf2cf0d471e4d4ffdbb5185889a0e9cd65af39 SHA256 4b8eced4b0649dc935acffac97119bb70862bebd51a686b32778745b407eb0cb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJObPneAAoJENwGBM22xffef0UP/3RLXVN1hrVZEgy3NLnJw8iS -aAcOwWr7ABRcK32O1lKTv1fNGHMzFq3SeOD0mW5F+CLSv5hxDEj4tx9eVFyGOrt/ -A1FNEn16QK/kTpCh0xpDFN2GVZPWyf7Ws2N3skL8k4G7jSOZ6Q9Xb3PGLAojmDLq -dgB/7H90WMqzSy3xkuLFdSnzFQxTwdliS4Xg+3zrYd5kBgyuv6AqrRN/Qj3kzEbc -BIYFr752ApLU7JvKmLB4qtFUMEa1XJxH62dP0I+loB1a4gRnLVmbt9iPu3vZpVrm -XFFjksk6uwOC9VrdqhWo+/kHYS7uArzEGkkoD1Gj8n1+IoQuWKDZpkbaaL1w0i4O -NMAus01HhCbmOdVyEfoa26k/0KrnkGefJxbRv7UhFOMmRTMDp6a+JkgrpLTrLbDV -SdeVKhn9mJ/e9W/G/lNgKB9Bbtcz3sm8dUauCkbTr7oZMzTZX4Np7W7BeJTgUEFQ -echB+3jNWTkPEhJiv6wnsypVPd4tTLRaUI04EVU4/Uo+B23uAk8rdohUSju9e4oJ -uqzAw7nRAOHgf41LHSVm6/I8aqRs5HHPL3p+gRCbCTEX0sVD1bz+iTHYqqaENyzU -KMCYuyy50Q946mryryKREvN7kPf2ZCd3BIiGJ2ICBkP1i6HDX1xq331Wxx3KABK3 -kR/n9JHNNuIOn3wQVTWP -=k3Ol +iQIcBAEBCgAGBQJObQJsAAoJENwGBM22xffefjMQAIy3mOcl6OjUJUAaEzKJpUVT +BMazcLhJ8hqrXDn9cs/5gJGBnzxMBkNoiiSN6rsHAkzE5gjQSee1JDiy0lNRF2rU +nUZJDalxp80BAssDztmr6ODKkiL6pnXgEEsuXnuoNT5S+Rh84ih1YQn23JbAeaOI +FWGweP0Exf/o5/h1//e1S7Obsh99UlLeNAdNpJKoC8ETa81ZJupuikCq8ql3251e +LP75IIRIDcudPlUPYC19QBzA86W7tTius2fEjNCmoBDV/7DEs6gGpJpd5X9Mplg5 +S+bPv0hndwMpl17DCjA133aijjjeAqeS+nmGv3q2nk9ztcx0En2pN0c/9msgRrqq +idEbMk/F79AVSq6eXXdqVYbE3xLPfzskQRqvuVuf2Y6EUU+xpS43F4LTssewGWLr +3hpy6x4EdJyrhaBhI3VydEerq46pHY7wLtDic55/4TV9+Sey0enqWQ3gT86O5MmT +yftGIg6n4oZi2rQjrLI/d/+4gFqPB9AjDWTI0Bt0/hBfkHLErEIR1mBbgJF1W7yV +az25XcZ2COeJqdFLlE4Sw4PTjZKi0GZziarj+ej1nbgDXz3KUaOO/CUKS7Cq5uwB +AlJ0KT56Mjaf36AZX+46s55W8eZRZfC0laZYd2E6GIHPZW4KBj8cpZ6NxPIBRTGq +yQ8wYmx1r/usA4Wj9LIb +=i2Xv -----END PGP SIGNATURE----- diff --git a/media-gfx/digikam/digikam-2.1.0-r1.ebuild b/media-gfx/digikam/digikam-2.1.0-r1.ebuild index 8d2bf3cac613..0bb826203698 100644 --- a/media-gfx/digikam/digikam-2.1.0-r1.ebuild +++ b/media-gfx/digikam/digikam-2.1.0-r1.ebuild @@ -1,6 +1,6 @@ # 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-2.1.0-r1.ebuild,v 1.2 2011/09/11 18:11:10 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.1.0-r1.ebuild,v 1.3 2011/09/11 18:47:50 dilfridge Exp $ EAPI=4 @@ -23,7 +23,7 @@ HOMEPAGE="http://www.digikam.org/" LICENSE="GPL-2 handbook? ( FDL-1.2 )" -KEYWORDS="~amd64 ~x86" +KEYWORDS="" SLOT="4" IUSE="addressbook debug doc gphoto2 mysql semantic-desktop themedesigner +thumbnails video" diff --git a/media-gfx/digikam/digikam-2.1.0-r2.ebuild b/media-gfx/digikam/digikam-2.1.0-r2.ebuild new file mode 100644 index 000000000000..ffed0bd013e7 --- /dev/null +++ b/media-gfx/digikam/digikam-2.1.0-r2.ebuild @@ -0,0 +1,148 @@ +# 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-2.1.0-r2.ebuild,v 1.1 2011/09/11 18:47:50 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/" +[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2 http://dev.gentoo.org/~dilfridge/distfiles/${P}-tag.patch.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 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 + video? ( + || ( + $(add_kdebase_dep mplayerthumbs) + $(add_kdebase_dep ffmpegthumbs) + ) + ) +" +DEPEND="${CDEPEND} + sys-devel/gettext + doc? ( app-doc/doxygen ) +" + +S="${WORKDIR}/${MY_P}/core" + +RESTRICT=test +# bug 366505 + +PATCHES=( "${DISTDIR}/${P}-tag.patch.bz2" ) + +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 +}