From: Andreas Hüttel Date: Sat, 5 Nov 2011 19:26:07 +0000 (+0000) Subject: Only build panorama plugin if useflag is set, bug 386157 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=616aa4bbd166e3d8093130b0658a0261ebd54ac0;p=gentoo.git Only build panorama plugin if useflag is set, bug 386157 Package-Manager: portage-2.1.10.32/cvs/Linux x86_64 --- diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog index 4bf41385575d..34faf0547830 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-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.103 2011/10/16 11:01:42 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.104 2011/11/05 19:26:07 dilfridge Exp $ + +*kipi-plugins-2.2.0-r1 (05 Nov 2011) + + 05 Nov 2011; Andreas K. Huettel + -kipi-plugins-2.2.0.ebuild, +kipi-plugins-2.2.0-r1.ebuild, + +files/kipi-plugins-2.2.0-panorama.patch: + Only build panorama plugin if useflag is set, bug 386157 16 Oct 2011; Andreas K. Huettel kipi-plugins-1.9.0.ebuild, -kipi-plugins-2.0.0.ebuild, diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest index 18b319c80c02..9a42fd309782 100644 --- a/media-plugins/kipi-plugins/Manifest +++ b/media-plugins/kipi-plugins/Manifest @@ -4,27 +4,28 @@ Hash: SHA512 AUX kipi-plugins-1.7.0-expoblending.patch 570 RMD160 c08b628dceb39b4a2dbe15fd376256785dd8cacf SHA1 763aec7f286f4cd208aa38f5665c62986bcfaddb SHA256 31788bac46a0af39e2b8475bdd84e07710af5d6655efbdaa6939795eb8b7d7f0 AUX kipi-plugins-1.9.0-tests.patch 1153 RMD160 40fdf55531219fbeebf7ed8ac60981e05222f2d1 SHA1 f8c3b30fbc9bbf0b95518acc3e86bfaa5581d6de SHA256 a675fa82a67f6e99d60f108d5c6479f39a2afb2c1a596c4468908ff51ae74c09 AUX kipi-plugins-2.0.0-tests.patch 933 RMD160 bcd1974a98a0471f381cde6ea91b2e980df63b74 SHA1 a77124e7c2b66616546b218ae9bc5e0bc0644ee0 SHA256 b8640df52463422dd53f0a4ac411eac67f15e8652157f820171ae85acd3ccb9f +AUX kipi-plugins-2.2.0-panorama.patch 637 RMD160 af10aa9d372525b726f6127c5708c94ec0d8d2c6 SHA1 04ffe616b1bd516009b8ff46bf138fc3f3a620eb SHA256 d83477c7b1c67342863aeb1b03ec6f8b7fa4a7b1ca0194d1d42e4ebaf920edee DIST digikam-2.2.0.tar.bz2 54181796 RMD160 5053a1f63e242d841f94ce707e235a5ccacb8698 SHA1 b4ce7c8b17978f3c76b107a1535cd4b21d3bb6fb SHA256 d7597d8817d2ebd363def6042022b25b665e91ea59c431ead3def4634221b616 DIST kipi-plugins-1.9.0.tar.bz2 5775775 RMD160 9bc1ae309e556335fa770e20b31b2527ddc4856b SHA1 fc12c018f4f73f7a7d025d7af2af99d4ae2dedc5 SHA256 d52466586725492788514c1b8d7bbea02f95c9deb744a0814d221c99c34e934c DIST kipi-plugins-doc-1.5.0.tar.bz2 1689039 RMD160 f4342798caf14817b96afdb11959f53ab175ae1d SHA1 55a57e1fffbd291ed2f31dbbe840ccd85cb499cc SHA256 13dfda13a1f5e276020dbae3f7c2227f5cc1ac4264070250eeff0a3eb59b67cf EBUILD kipi-plugins-1.9.0.ebuild 2713 RMD160 4c4c6567a948f3186524f4b2cd29449702157a93 SHA1 7e845183506a14463199f9fe87cf5fa1208b7709 SHA256 0f1f3a47ce70fc910de82d9e6c6d286694b1286fbfeb34e842e1b73b504b078b -EBUILD kipi-plugins-2.2.0.ebuild 3293 RMD160 d7ff21786a8c30ed585dc07e33d3a82013354fb5 SHA1 16383ca85ec5e6111777a0237e352372523cc25a SHA256 1d0b31ebd8b952459501c4f9568bf294460241aa9fc09a2ece030f81df70324f -MISC ChangeLog 17556 RMD160 215330d59cc6c302cac522dcc257e66b7e269ec2 SHA1 ab44d8ab90aac591dc73570c7e1e5f35c11cf6fb SHA256 8813c12fdc75856517770db2bca1d561df6abb58ce92f15c1b966dfebd9d6462 +EBUILD kipi-plugins-2.2.0-r1.ebuild 3375 RMD160 40ea3cc87ca7c91c35a4276c4ced6a7c673946ce SHA1 bde8013eea058026342489e808fb02793dbbd321 SHA256 fdeb90a7117b85fd0ad964bfdd7d9f1a160d0ba2dcabee721f148a2bf0509a36 +MISC ChangeLog 17816 RMD160 c8261256181dfbe504f235fcb346748c7872c81b SHA1 16ad5be1d67cb963db6ec2ee6d03de407c64efe2 SHA256 72462f1fe2302a9b2684e3a8ccf4a3e3ad0e1c0106e2f2e6cc51a9ca3812d153 MISC metadata.xml 961 RMD160 767e890545236003bd89a73778ca0ef347a67e9a SHA1 a5d91c03c129d0ed92d792806ff6ccb22da972b6 SHA256 8a137c5797a41e37989bd78aa7761c84a42b685b59b7f5b3ddbd1639b4637af0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJOmrnbAAoJEEb+UGWnxTyHZkoP/0rEpCt8dGh/p62HLocfLyXs -1ycgXVicSocSSdqDCM/2yM/Srw6oBN3NxqMWA0L1KnolPXvOofao1e98Gj9P50zG -EAsdCoAcGw0AUCaC0zvMmlM/z9Zgd3t74ErpMe2/dxjMRq2T2hofmZ6LM1/7dfBn -FIgf/wugr6prxfwDSR9ori+nH7+799Q1ISp8cIqrqXny++pFpvTpVM5NRklH+YRx -FoEtE6QX420hIsmP/tcnCnpb47ZabnCMOCqnyIBroWoNLf1soC5THNzZ3nvsRPNf -XLwhHjQGFS2gMoSxwXA7bPrVYQvey4zTvseuQhqPVoK3YrDCrybv8lPqYHogTRpc -YZPBR3A2zPc0umX8lg+LUPYr6+PNIkZxzrAunoOJ4M/yWPNPuKSVDNWSOxz4DCUd -GIujFTQ/Z+T80WMQavSulZZZv/nVU2s5SSfJ8kZD+I1t1ulxRThwOLQru1nusyA9 -oersH1Cw4HK83zZvoVUPsGhUdpPJnhHdp/qM4Tv9FKxeQVsvpdZxRN9odDQdoMog -9MhaAWzvA1xomlZvjAQWeOXLQgq0hE37kFkYqvNsi+XMpaZquNvhmSNCfFmd/rCQ -IUl9WzSF6K8neijwKUmgbRRznCU92E/+d5kBfLCGGEcUZo800QIu0pMzCMgADoHG -h584CXKB4NJfrQl7Ip7O -=ZeEf +iQIcBAEBCgAGBQJOtY3nAAoJENwGBM22xffeRCcP/0Um2Ru0elTKXwq/W30/gGrd +eKHKOiGtCkR/5OglVSjfp9s18yHZ9tieNl1ufywZR95KwGJ8WVzvyxnRRjlpLR1x +pEypaLRAn/4XJctGxH8SCQZgWF8FzFTp8cQ9d7z2D6x9VdnFtDqsORit7mgNsjXa +E7OZrP2i9UvPYqG+kCrRL+4CL2FU/YnD5cXjQJtJpiDzUzo1rfPdfTFTq/XU6oGZ +TSx2YGLjcRqUk3l/9RNmVVoxJHFqEsaIj/AQfnc7f7ECYCTkL6oqlZtuQ3fwEdMy +iWPQdOfrQg8ev/TJTvInWtvkDHx8w2it/sTYLoi+Z3vybXWLQpaZ3KMMDQJRAGRi +Si73mrKB7/yf97a2dJuSN2yaWVJBswirT33KIPymadCEMV6D6wlCzLB2wptNnFa/ +8TQuhBkCLhg1BztZjy7cRWNa/9N+n0PuK2Lc8GCejJFcZ+d2p/AlRpXsBKd/Ir7n +pXxdJGLpNw7OQW/FBsm2CZOvEGan/UQcmUyH0NR3RrVWm+f3FSkfHuJbyyhBq9yJ +9w9wzqfx9jx/R4aa6vNCm1q55dicp+i0//kZdXMdo59/12zb2b/R3guwUxmd1moj +9pCpIApuaYOVvzYQ90WZUM3yY1l2TqyYKqvyoYKOAEMLEmPHBkYZIK3xuX314Hoc +PxbnVaJ4a7BnympZJoOI +=rOY0 -----END PGP SIGNATURE----- diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-2.2.0-panorama.patch b/media-plugins/kipi-plugins/files/kipi-plugins-2.2.0-panorama.patch new file mode 100644 index 000000000000..fbe832a64b3d --- /dev/null +++ b/media-plugins/kipi-plugins/files/kipi-plugins-2.2.0-panorama.patch @@ -0,0 +1,16 @@ +diff -ruN digikam-2.2.0.orig/extra/kipi-plugins/CMakeLists.txt digikam-2.2.0/extra/kipi-plugins/CMakeLists.txt +--- digikam-2.2.0.orig/extra/kipi-plugins/CMakeLists.txt 2011-10-03 12:34:09.000000000 +0200 ++++ digikam-2.2.0/extra/kipi-plugins/CMakeLists.txt 2011-11-05 20:14:23.000000000 +0100 +@@ -389,7 +389,11 @@ + ADD_SUBDIRECTORY(batchprocessimages) + ADD_SUBDIRECTORY(rajceexport) + ADD_SUBDIRECTORY(kmlexport) +- ADD_SUBDIRECTORY(panorama) ++ ++ IF(ENABLE_panorama) ++ ADD_SUBDIRECTORY(panorama) ++ ENDIF(ENABLE_panorama) ++ + ADD_SUBDIRECTORY(photolayoutseditor) + + # Plugins which are optional depencies. diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.2.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.2.0-r1.ebuild similarity index 95% rename from media-plugins/kipi-plugins/kipi-plugins-2.2.0.ebuild rename to media-plugins/kipi-plugins/kipi-plugins-2.2.0-r1.ebuild index 5f0dc5f56758..377affca711d 100644 --- a/media-plugins/kipi-plugins/kipi-plugins-2.2.0.ebuild +++ b/media-plugins/kipi-plugins/kipi-plugins-2.2.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-plugins/kipi-plugins/kipi-plugins-2.2.0.ebuild,v 1.2 2011/10/16 11:01:42 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.2.0-r1.ebuild,v 1.1 2011/11/05 19:26:07 dilfridge Exp $ EAPI=4 @@ -71,6 +71,7 @@ S=${WORKDIR}/${MY_P}/extra/${PN} PATCHES=( "${FILESDIR}/${PN}-1.7.0-expoblending.patch" "${FILESDIR}/${PN}-2.0.0-tests.patch" + "${FILESDIR}/${PN}-2.2.0-panorama.patch" ) src_prepare() { @@ -110,6 +111,7 @@ src_configure() { $(cmake-utils_use_with crypt QCA2) $(cmake-utils_use_with scanner Sane) $(cmake-utils_use_enable expoblending) + $(cmake-utils_use_enable panorama) ) kde4-base_src_configure