From: Andreas Hüttel Date: Sun, 21 Dec 2014 20:57:37 +0000 (+0000) Subject: Version bump; remove old X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d1d8dec260e13b19dec4c93fd7cf707b7ebf71cd;p=gentoo.git Version bump; remove old Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xEBE6A336BE19039C! --- diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog index daa5dfe0d7c4..f588c655ecd0 100644 --- a/media-plugins/kipi-plugins/ChangeLog +++ b/media-plugins/kipi-plugins/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-plugins/kipi-plugins # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.172 2014/12/12 15:50:27 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.173 2014/12/21 20:57:33 dilfridge Exp $ + +*kipi-plugins-4.6.0 (21 Dec 2014) + + 21 Dec 2014; Andreas K. Huettel + -kipi-plugins-4.0.0.ebuild, -kipi-plugins-4.2.0.ebuild, + +kipi-plugins-4.6.0.ebuild, +files/kipi-plugins-4.6.0-options.patch: + Version bump; remove old 12 Dec 2014; Mikle Kolyada kipi-plugins-4.4.0.ebuild: amd64 stable wrt bug #517344 diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest index fa36ca994733..757c107a2669 100644 --- a/media-plugins/kipi-plugins/Manifest +++ b/media-plugins/kipi-plugins/Manifest @@ -3,22 +3,31 @@ Hash: SHA256 AUX kipi-plugins-3.0.0-options.patch 1069 SHA256 064e9b865c21491eec7947cf0e12160866983f982243a4cc715efbf9116b172e SHA512 d58edfe3955e480e34c3ee64313c5ada15a664df7dc2369791f1bd5d7e05bc5f1666681d5b008a580de6cb00ff6c87d13dd1845ed0d7ad70a76e9888edce96cd WHIRLPOOL e59b098d5f8fcb2b487ae1dda07ed0cbc9cfa81095655eb120e985defa2aadb7e2bca6db015f1f1c6ef1645e2c8b1f329cb595c588ffc3f09c977b2cd69d856e AUX kipi-plugins-3.4.0-staticar.patch 877 SHA256 43e67c5da27331664c3ab3b97d8a481b4836ffd1498db55bee1bbac5489c9d5a SHA512 bd904c38b5acf4247707ea20e3c99ba602225969f1b9f006aa0f69f01ed8c127c4c1fe5183f1bf1bf71dd3fba36d6de787294a3b0de023520352066e10ab0047 WHIRLPOOL d9190cc44b6e1536806b42ecfe43edf6f9b6cbc980722a1407247d1fe2440db92e9831b61e1e089da0d5fa4867f204fff4d803aa8e064cf684b37053f377dbe1 +AUX kipi-plugins-4.6.0-options.patch 879 SHA256 ee42da1469c0aae8eb8ddfc9a80db44db9ff99fb467eec1c7fe1aaadb627213d SHA512 95a34cb4077390ac8b827e870fb501b87e27a9e624bd19f30cfee774282b4abe6e7da7d5f7d57ebfc962ea6b88c92ff793e0867ce97c474b34beec347370fddc WHIRLPOOL 0bfb2a446130a50de78507d371436f54a2293fa189072bc157631e70428c6bfea815a3aa38efaf40e38fa65856a8db1292072e9e99ecf2fc6ed94ac0029fa7d1 DIST digikam-3.5.0.tar.bz2 65698806 SHA256 57bd2aa4fdde44333d1362b02b26ebf6c1a70675bf5cb40de5172df02857c42a SHA512 d9c4651398ab85490016324ee69d1303e57e6ac646ab48ac5860d2966b3f3f0b5b4112de1d793795aef322d3dc6e7c3aba33bd2b164a084e5b65d38944fb0d73 WHIRLPOOL e7e6527270f3daf6ca97c007253793ea6e02b637f86f3355d675bfc0d562a36d5a7311d2e1be0701bc4f6119037398bbc6f2e9deb4da04f01cc008ec52679aba -DIST digikam-4.0.0.tar.bz2 68931371 SHA256 984f7a47a3fdd5b5b30991b436848ed420fbcfffa01ffaa3abdf7202848b17ae SHA512 d76dbdc72fc5c42e2628d43bf669cce53b82e21eb5dbfa3c908740ec10f2bc949f6faba595f36e3a376f9d9c8b9db8af2c10a4921bd5b21d9c744b0bd8570661 WHIRLPOOL 55463465f2b1a6b9fa8bb9e63e1ac1fd5fa8a21f41ed94bf5a7e9ba8404ebf0cc3e4d027d51179881736a4cd40734774c2c666e7f3a4a40396230330f69b21c2 -DIST digikam-4.2.0.tar.bz2 68849613 SHA256 e86575b76672dfd0a7ed5f1d7b8b74425171804d7f16b0d743a5d2375c1c1b08 SHA512 ff9442360a343beff1643ef95f4dcff81e764a03cf18d8de800b45ca19b0a3727e59916ca0613cf4977c8e19ebc87f3f6682a48d5ab78b313b1d0189fbaa1169 WHIRLPOOL 5aee618acf79301a08d5efc30cc6a754d884b491fbf28bd555ac109b304725a8da1ff75c26af8d241414549957827665c9bf6299c030df5b7e71c74a4ca5886f DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a WHIRLPOOL 7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c +DIST digikam-4.6.0.tar.bz2 70266430 SHA256 b047a3172203e036c35f73dbb93cc7e71408c05bedaa8f7f1e0cc539a355a345 SHA512 557133712c88f987fdde4c9b3d97c09c7f744a7d5bc7056803a2bf828a7f8fbe0534f9a131b82175c1bf2a5a76fb4ea06c21a70f9925082239a9fce74efa4b92 WHIRLPOOL cc07964fe78e0fbbf6753344a74d51dee88caaa70ba3d68fbac7f766f8ee1996eb435bf56a2d51882c842b54d5a3429763e358b58b5ce6ccc1870fdd2438101e EBUILD kipi-plugins-3.5.0.ebuild 3715 SHA256 b04126392bc2eb60c0a83caec5ab7a4a3f98fd219e45153642dc60331133ac99 SHA512 cdf2dfa38a3b07be866c241418ca89137b301281549bc0ce97f208017d8aa485482384375132d06706f46fcde3270a2e6ba367a94b5e56aa2d529377f7b471a2 WHIRLPOOL d73780f26e17359a980c6fedac26a321e46593fd2d0fab9a96774616167b45028a18bb33634a90e760c3f5aa580da185849fe5a2fdde1f67291a06add5a054e8 -EBUILD kipi-plugins-4.0.0.ebuild 3693 SHA256 88159e67c37fd5bf58bea9c8101283ac0521ffe99bd9f8cd2f30d6f83c7abf32 SHA512 7be9a0fd57b53c207cf4c8de469d1c75b11523f63f47443072af5eb94d5c6608733c2209e033443b9665d5b5871f83567f0e607c9d67bab5e175b9e2a41ab004 WHIRLPOOL 78fb85571f6aa7e2e463eb915c1e935bed1095a430617c443e4c898c240bed13b1c7b193cd71ef2cb8e14b98ebc92d397f7117d0c64226a05d43afa3cd36b03d -EBUILD kipi-plugins-4.2.0.ebuild 3767 SHA256 ee5c975d3e505e99e72eaaadc0dff5298217be5f82811b61c1c79aea7b9731d9 SHA512 64f1c0a5b5f603378520453f940ade4ff284f6769649c96bbe24a001186626c20a4cdfb4e37f6ae422355e046b2367d727ca03455fd24279bf6ba590cfae2e02 WHIRLPOOL 1916b176713587e7305fb48571947d6b6f43c0fbfc581aebf773a454ae3ab54c35cdd33c363c7f57a1426d1c93f928fd43228fb3e5bc9fb2d6603b806e4fc01c EBUILD kipi-plugins-4.4.0.ebuild 3776 SHA256 c1f0ed8c6625e31b615e64a3d27d3465362ab4c79aade1f0f7739950afc19866 SHA512 aabd2093253f6a193befed74f88e1188541328c899830f316541c7a1fc8f654c2480430bc05cd5d5145128bab74ed103c1d87624adc2eca202a15380f754d9ec WHIRLPOOL d34f7f3d1b829424ef5b6e08215ff75b9251c914237cb3d1b333f7e582ab2eef17cd4f365bb88c7308ec526e2eebcfd85256f6830957d6c9cb6df21d6ad82787 -MISC ChangeLog 28116 SHA256 6a0a63a49c7248ff9e8920af28c180483f327628b8fc81fd7fcf542a2b9162a2 SHA512 103b20b13d20b4f4e61e9a60083e8b2a992a81ecd18f2865c8c8cb78ece4e5084c4d8fb1716237d3331a342c25bbf59b30563981c9a3ce3efbd0e32f4c4f9198 WHIRLPOOL d90831278898cf3a268024c182106ae53fd7f587db618c50d18a1665a4175ab50b7a73bb3f9c00e55a9c57c6e03f9fe4d84ed1080c332a3fb9827fb20a0d32d6 +EBUILD kipi-plugins-4.6.0.ebuild 3886 SHA256 afa65857a8269cb228d175b365934f374ad8c28b320722c1fd9b4b07e8397269 SHA512 f24f6f69bc38ecad878185d3aed6fc6dd6951213583e4d3cadaa71fe30d6adf6f830b065f1d4721622b672ae18ef8cdbe5f37b4f122eea4bf53ebabf9756818a WHIRLPOOL d20a45413b4e7d7e31153dc5de303e6504dd4244019f8efd319ef57af2de98dd8453b7d15f76aa09805fc27cb8bf3ea8c0cbdde2c0727c9df539c8e6b8f7d504 +MISC ChangeLog 28367 SHA256 a429946dbe9b5b5fd5adab8b616b76fcbdb195e0c37ec4d4d6a95caa11f0017b SHA512 68c37d105f469991eb1cb7d63e316cf9446fb6e1a5f408ebd8caabb881e4aa6a7edf72f2ce3f3d001c0c5edb91bb51cd0a6472e477133c45fd5e49a5a9049fc5 WHIRLPOOL 706287c3fa36e11d0a91d8bf6ff4d117dbde18025238fd8d212a51464f9648f744241c5ff8e5260967c70ebdba77b0ac0d98680a0aa66b7471e90774e3e6b88d MISC metadata.xml 1024 SHA256 f17bcdc8b53cd0535a88e8889018faeebc810b0e3508bdef4f0d1a27b97e86d0 SHA512 5f3007722c81efe4f6e224ea91e0e9dac1157205d039b76a68d1e0c978c2e20a79b91c9d1b565035c8fb1a444a25dc96db299538498defd05e52a1072c2af54c WHIRLPOOL 38a851de1c962df10b16242bfe22f98259e1ef0c9c73edebf4bddcfe94641d766114445da822f5d06c2925cbe68e89bff747c24d6c002be011e2c6c8c96cbfd6 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iJwEAQEIAAYFAlSLDmwACgkQG9wOWsQutdYALAQAuYbZCf3HyXmVr4Pg23VD6GLQ -kKt2QXZrgdkTeBRFT8R3aSAydbmhy3NNT85tpSeIY9443SguUakpUa/TfKWRjvKP -yfbXk9fPz6CC3W6ANxMYHujX6GG2I2T8nOoSfacHE3/6Uvx/y4Ug+gvSkVWYE2Vz -xnXf9P1QY1rnHtqyPlY= -=C2Us +iQJ8BAEBCABmBQJUlzQ+XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF +QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOc9yoQAJ7orPB3+MztVNtN+8byYzM+ +dT36kAyTYE4BC41lubqMRkJSFk18DhrP3hDj9Cr5OKDR6bKNcBd0DnGqUkMw9KQf +5NkLvJOC23kHasrPwpWSzBOW0f7M6C4yE12b0uogcadZhr1I1u3307kRDSpy9VO0 +2ePCPXZiZjRVx8I+px+LkEgNkuUm2/HZ1ctLiwPAgN98j0pWuWDR28nxFy97h8c3 +HdZUe+SZuUg0MdXB6p33vUWh0+VC35ZYuSXE5aLVF93ccVPmy6eFuncxDMiwVDam +P1Vv+6A1TJnL+cAExLIVGLZf47W8NxexuvJLFYf9KvSXLOW51yy8N7+cJAXv8XoN +qO52JHf+EM3t6OyT+uZ/yAkiOCq1k+/UZvFyf6Nb8nITJ6TZmeBGkYTRvJH8mrM/ +YETK9zdiLgCvHJLMdIAPPkI3s79Z0g7+5i8X5nNMwOv50K6ho2XAQWVHsjMsYEh/ +8V5bMMo9aEgtWtyouHk95ypRkHqirm2Bw+ZIAB9HTSIFIB95KyUuef3ZFeRYWL0h +7mAszdvCaLL9epKX955CqHH4cDt8fH4KXGA9B69U1IYlOYm5zursfuykuxLZGFav +ffsEPuS2HmosvFm1HpHy8gWeQgZzaflpCfz7rzyfqjyt0Ao2N+0XoTGdHoCIxP+7 +wb9ZF12HXbGrewHs+G39 +=utfe -----END PGP SIGNATURE----- diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-4.6.0-options.patch b/media-plugins/kipi-plugins/files/kipi-plugins-4.6.0-options.patch new file mode 100644 index 000000000000..100e935e9a64 --- /dev/null +++ b/media-plugins/kipi-plugins/files/kipi-plugins-4.6.0-options.patch @@ -0,0 +1,24 @@ +diff -ruN digikam-4.6.0.orig/extra/kipi-plugins/CMakeLists.txt digikam-4.6.0/extra/kipi-plugins/CMakeLists.txt +--- digikam-4.6.0.orig/extra/kipi-plugins/CMakeLists.txt 2014-12-16 08:54:40.000000000 +0100 ++++ digikam-4.6.0/extra/kipi-plugins/CMakeLists.txt 2014-12-21 21:50:39.901188497 +0100 +@@ -370,7 +370,11 @@ + add_subdirectory(picasawebexport) + add_subdirectory(smug) + add_subdirectory(printimages) ++ ++ if(ENABLE_expoblending) + add_subdirectory(expoblending) ++ endif() ++ + add_subdirectory(kopete) + add_subdirectory(batchprocessimages) + add_subdirectory(rajceexport) +@@ -451,7 +455,7 @@ + add_subdirectory(mediawiki) + endif() + +- if(FLEX_FOUND AND BISON_FOUND) ++ if(FLEX_FOUND AND BISON_FOUND AND ENABLE_panorama) + add_subdirectory(panorama) + endif() + diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.0.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-4.0.0.ebuild deleted file mode 100644 index 39423c652a63..000000000000 --- a/media-plugins/kipi-plugins/kipi-plugins-4.0.0.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-4.0.0.ebuild,v 1.3 2014/09/15 23:30:42 reavertm Exp $ - -EAPI=5 - -OPENGL_REQUIRED="optional" - -KDE_MINIMAL="4.10" - -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" - -inherit flag-o-matic kde4-base - -MY_PV=${PV/_/-} -MY_P="digikam-${MY_PV}" - -DESCRIPTION="Plugins for the KDE Image Plugin Interface" -HOMEPAGE="http://www.digikam.org/" -SRC_URI="mirror://kde/stable/digikam/${MY_P}.tar.bz2" - -LICENSE="GPL-2 - handbook? ( FDL-1.2 )" -KEYWORDS="~amd64 ~x86" -SLOT="4" -IUSE="cdr calendar crypt debug expoblending gpssync +imagemagick ipod mediawiki mjpeg panorama redeyes scanner upnp videoslideshow vkontakte" - -COMMONDEPEND=" - $(add_kdebase_dep libkipi) - kde-base/libkdcraw:4= - kde-base/libkexiv2:4= - dev-libs/expat - dev-libs/kqoauth - dev-libs/libxml2 - dev-libs/libxslt - dev-libs/qjson - gpssync? ( media-libs/libkgeomap ) - media-libs/libpng:0= - media-libs/tiff - virtual/jpeg - calendar? ( $(add_kdebase_dep kdepimlibs) ) - crypt? ( app-crypt/qca:2 ) - ipod? ( - media-libs/libgpod - x11-libs/gtk+:2 - ) - mediawiki? ( >=net-libs/libmediawiki-3.0.0 ) - redeyes? ( media-libs/opencv ) - scanner? ( - $(add_kdebase_dep libksane) - media-gfx/sane-backends - ) - upnp? ( media-libs/herqq ) - videoslideshow? ( - media-libs/qt-gstreamer - || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) - ) - vkontakte? ( net-libs/libkvkontakte ) -" -DEPEND="${COMMONDEPEND} - sys-devel/gettext - panorama? ( - sys-devel/bison - sys-devel/flex - ) -" -RDEPEND="${COMMONDEPEND} - cdr? ( app-cdr/k3b ) - expoblending? ( media-gfx/hugin ) - imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) - mjpeg? ( media-video/mjpegtools ) - panorama? ( - media-gfx/enblend - >=media-gfx/hugin-2011.0.0 - ) -" - -S=${WORKDIR}/${MY_P}/extra/${PN} - -RESTRICT=test -# bug 420203 - -PATCHES=( - "${FILESDIR}/${PN}-3.0.0-options.patch" -) - -src_prepare() { - # prepare the handbook - mv "${WORKDIR}/${MY_P}/doc/${PN}" "${WORKDIR}/${MY_P}/extra/${PN}/doc" || die - if use handbook; then - echo "add_subdirectory( doc )" >> CMakeLists.txt - fi - - # prepare the translations - mv "${WORKDIR}/${MY_P}/po" po || die - find po -name "*.po" -and -not -name "kipiplugin*.po" -exec rm {} + - echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt || die - echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die - echo "add_subdirectory( po )" >> CMakeLists.txt - - kde4-base_src_prepare -} - -src_configure() { - # Remove flags -floop-block -floop-interchange - # -floop-strip-mine due to bug #305443. - filter-flags -floop-block - filter-flags -floop-interchange - filter-flags -floop-strip-mine - - mycmakeargs+=( - $(cmake-utils_use_with ipod GLIB2) - $(cmake-utils_use_with ipod GObject) - $(cmake-utils_use_with ipod Gdk) - $(cmake-utils_use_with ipod Gpod) - $(cmake-utils_use_with calendar KdepimLibs) - $(cmake-utils_use_with gpssync KGeoMap) - $(cmake-utils_use_with mediawiki Mediawiki) - $(cmake-utils_use_with redeyes OpenCV) - $(cmake-utils_use_with opengl OpenGL) - $(cmake-utils_use_with crypt QCA2) - $(cmake-utils_use_with scanner KSane) - $(cmake-utils_use_with upnp Hupnp) - $(cmake-utils_use_with videoslideshow QtGStreamer) - $(cmake-utils_use_enable expoblending) - $(cmake-utils_use_enable panorama) - ) - - kde4-base_src_configure -} diff --git a/media-plugins/kipi-plugins/kipi-plugins-4.2.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-4.6.0.ebuild similarity index 90% rename from media-plugins/kipi-plugins/kipi-plugins-4.2.0.ebuild rename to media-plugins/kipi-plugins/kipi-plugins-4.6.0.ebuild index 052ada674447..d1f94eea865d 100644 --- a/media-plugins/kipi-plugins/kipi-plugins-4.2.0.ebuild +++ b/media-plugins/kipi-plugins/kipi-plugins-4.6.0.ebuild @@ -1,6 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-4.2.0.ebuild,v 1.5 2014/12/09 21:30:10 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-4.6.0.ebuild,v 1.1 2014/12/21 20:57:33 dilfridge Exp $ + +# +# TODO: complete packaging of qtsoap and qtkoauth, see dilfridge overlay for work in progress +# EAPI=5 @@ -39,7 +43,7 @@ COMMONDEPEND=" dev-libs/libxml2 dev-libs/libxslt dev-libs/qjson - gpssync? ( >=media-libs/libkgeomap-4.2.0 ) + gpssync? ( >=media-libs/libkgeomap-4.6.0 ) media-libs/libpng:0= media-libs/tiff virtual/jpeg @@ -50,14 +54,14 @@ COMMONDEPEND=" x11-libs/gtk+:2 ) mediawiki? ( >=net-libs/libmediawiki-3.0.0 ) - redeyes? ( media-libs/opencv ) + redeyes? ( >=media-libs/opencv-2.4.9 ) scanner? ( - || ( kde-apps/libksane:4 $(add_kdebase_dep libksane) ) + || ( kde-apps/libksane:4 $(add_kdebase_dep libksane) ) media-gfx/sane-backends ) upnp? ( media-libs/herqq ) videoslideshow? ( - media-libs/qt-gstreamer + >=media-libs/qt-gstreamer-0.9.0 || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) vkontakte? ( net-libs/libkvkontakte ) @@ -85,7 +89,7 @@ RESTRICT=test # bug 420203 PATCHES=( - "${FILESDIR}/${PN}-3.0.0-options.patch" + "${FILESDIR}/${PN}-4.6.0-options.patch" ) src_prepare() {