From c26c5f85e4ec4762905dabcf6e895ae119218a61 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20H=C3=BCttel?= Date: Sat, 12 Nov 2011 15:52:28 +0000 Subject: [PATCH] Version bump; remove old Package-Manager: portage-2.1.10.34/cvs/Linux x86_64 --- media-gfx/digikam/ChangeLog | 9 +++- media-gfx/digikam/Manifest | 35 ++++++++-------- ...m-2.1.0-r2.ebuild => digikam-2.3.0.ebuild} | 6 +-- .../digikam/files/digikam-2.0.0-tests-1.patch | 41 ------------------- .../files/digikam-2.0.0-underlinking.patch | 29 ------------- 5 files changed, 26 insertions(+), 94 deletions(-) rename media-gfx/digikam/{digikam-2.1.0-r2.ebuild => digikam-2.3.0.ebuild} (92%) delete mode 100644 media-gfx/digikam/files/digikam-2.0.0-tests-1.patch delete mode 100644 media-gfx/digikam/files/digikam-2.0.0-underlinking.patch diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog index 20be384aeeda..c198ba7ad96d 100644 --- a/media-gfx/digikam/ChangeLog +++ b/media-gfx/digikam/ChangeLog @@ -1,6 +1,13 @@ # 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.200 2011/10/19 19:11:12 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.201 2011/11/12 15:52:28 dilfridge Exp $ + +*digikam-2.3.0 (12 Nov 2011) + + 12 Nov 2011; Andreas K. Huettel + -files/digikam-2.0.0-tests-1.patch, -files/digikam-2.0.0-underlinking.patch, + -digikam-2.1.0-r2.ebuild, +digikam-2.3.0.ebuild: + Version bump; remove old 19 Oct 2011; Andreas K. Huettel digikam-2.1.0-r2.ebuild, digikam-2.2.0.ebuild: diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index b4d68ef56388..7016a6db1fa2 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -6,33 +6,30 @@ AUX digikam-1.9.0-docs.patch 1466 RMD160 d12a4bd9e825d88863da954763641157a87f11b AUX digikam-1.9.0-newpgf.patch 3463 RMD160 4e5c506e81436aaafe5b789d79adcb1caee4407b SHA1 3bb97db282fbb0c50e03cd4ba6c5ac6821558620 SHA256 9ca068c87868b9709d75441795bfff2790d13957354b675a9aa94d5f3d55eca8 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-tests-1.patch 1880 RMD160 8961d7cd5cc31469da1e0d338f05b56c0c90f43d SHA1 f52a04eb8fc4288cbadf6c975622af0cffbf8776 SHA256 ca07b4ce9651386f7355007a4c02727b0097962f2664a2a2b20c7208fdc01bc2 -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.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-2.2.0.tar.bz2 54181796 RMD160 5053a1f63e242d841f94ce707e235a5ccacb8698 SHA1 b4ce7c8b17978f3c76b107a1535cd4b21d3bb6fb SHA256 d7597d8817d2ebd363def6042022b25b665e91ea59c431ead3def4634221b616 +DIST digikam-2.3.0.tar.bz2 54522109 RMD160 304bce5841f5d36a72a064784c90c91960c9a7c3 SHA1 15b8b16d7cce6ac50fb958d30166214f2f2b83ee SHA256 29ddf83a160817314e9274a35d678678da58006e41d961dcebc6afb0ab200a33 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.1.0-r2.ebuild 3931 RMD160 559c9a4b431325095ef8210c5f9748fd29764567 SHA1 e907ad201bf1e88939803e5694780166945dd2d8 SHA256 0b6b2d0402c3e61b12c0c5f5dc747b7cf96d8f2a8bafc35d33f43542597704c7 EBUILD digikam-2.2.0.ebuild 3821 RMD160 121b65f56b190d76d4c15c16ad9398bf27b97637 SHA1 e2a41d712ae4cc04b750d0c218fab557827cd73d SHA256 33bdd66c25d6aadadb0792a4393c4f0c4ff5f2f4fa0b2e6c070eaba840feba31 -MISC ChangeLog 33958 RMD160 64e6055a23d4508f985e0248a8c524531ad65b36 SHA1 cd655271e7d124ae6d05be25fded1ed3dd4e965f SHA256 b40a426830869fa81fdb94f9b9d46d8f372dd27ecedde4c6badf8ae4573a328b +EBUILD digikam-2.3.0.ebuild 3796 RMD160 d9d32dc4b87dbd1ff0d2ce320b23e2e35fb233ab SHA1 435b9f34f628818a06bf66f303d71e7b3e5c94a7 SHA256 97a9e40e2ba20bf82fd6893a0900880715747d61d01d7ede2ba347497c0afc8e +MISC ChangeLog 34203 RMD160 31694aea567b73c5ef533f461776779b925b951a SHA1 7215d269bdc1847ba5e8897e0d89d5c2c7980e21 SHA256 fb33f064123f8c74fd0e8f70882379fa7cc4b1d6af5cd4c4eccbf03ad33ffdfb MISC metadata.xml 751 RMD160 b65e7816a03a284f440d296c1853aa913105129a SHA1 c6bf2cf0d471e4d4ffdbb5185889a0e9cd65af39 SHA256 4b8eced4b0649dc935acffac97119bb70862bebd51a686b32778745b407eb0cb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJOnyDfAAoJENwGBM22xffeMUMP/1T2ZlEPRweBS7Rrn2XA3mVR -mPWeStUtI8rstqLPb5uZU2of+rA7a8sVnelvd57g6Mtxj285MYUvQ3Gbcxh2uqba -6LcVQPNDiY8u2h+GJGPigQ2YsXRRHpAVLgRru8YMgOfIi2iwJhCLTJjGBc45U7ta -SUPPOJ6hU1Z4WbNUKSsCjw3dUjOp+ztHw1m5te7mgaaCKf4cF4wZcRFpXk9SYaHT -kD7s9rcreQEKRZIWShn16Nudv1W+5vPeRBgnA0g9PY5moSxSFuVsuphuwMLjPTWa -70Rez7ndoPvA39jRGH2dHiMQ4d3Oinm36vXWToaRckUaI6s6wI3ZMFRuF39zD54Y -af/KGBFhCLGiEoBRv2ATPYbsnqwREhttvqvQGQJPtz3+8WBqvIv1S14sSmVmmzxu -5DQQ+qaQ5sfds1JeoA9MgRF3DesDO5i9JMO9V0qvVcRIUZQjbmZDI1f7DywlgR6Q -Y88sieMFP0AMdM96ahW7SRPekvGsI/5EQqurK1zH5SfE6DYzwqtq5Ny2HUYgKoxD -yWUPGVVrnsrO7Kqlo1uKvZ6fDn238FOwMOYV6IpKCxLqAB7jYRvpzPacPrMC9VIF -HIn47C4DBOqYxC0IyE79Z3h3DA8IRgJ8toj9Pi16J9mL5Hu7tmd9MXNj7UqPHH21 -0juhSqhWzGlVdXJxXllt -=duV4 +iQIcBAEBCgAGBQJOvpakAAoJEEb+UGWnxTyH3hwQAMBa6AhDDtszpZHM+LLuZ6K5 +KqbAORJKbShXpcBEieLDDp7ugaq88zQCpQKU2Yrlsk3yqsdnvGJ7HcWPZcEWzTYp +yvm/dtTLS/M5adVJrD8VQUxHaJE9Jcd2Ox+AWFTrNsgIl2IrPfQWaM9VOrYXf8iD +is2DkovbDaLZUrOP2/bx6zX4HroLGqNBYhZkXB0IWh3S8Fy17t6NYVsgHjTicdOq +Y5EztVB9p5IhmRxFYVulOjeGT5STzBdQDq3m/YVh+8wCfsZcGll8b+n4vTyG3UYO +V2kTxMo9jLUte/2aXeVbLHHpSInEsIrB6WlabYKVM+rnOvZHI3cBaqWPgGlILy5I +942UZA1ediGNgiqnzO4KCV/gLN5gTz+Eyz+HpLBa01+OXHwPKTL8VraV7EXmpdmD +WLR8ggDK4gluzFLEsAfdpmT8D7Y3rtxxEHTLdpTbinhyWsZj3vxWtWUwhnzT5GKD +mnpK0BIQjtPGfDiG2sYRVSIsFERQgWKwsc7tKT+pqhM1yejnLQ0YdWIrJq7nI8OI +DoikaLoGVevD+tRrCgC3CT9si6+H2uBF//TdTcU5cp2w/CxSC5Y+FA7uYoq9B8Bs +5NySVr4rkorSzpSfCOT3RwMadMaUMOWU8AjgDPsjFxKMtKb/+vbZ08fWpQuDa6Ai +/a5to+pgRjNYVibD/zvW +=7QyN -----END PGP SIGNATURE----- diff --git a/media-gfx/digikam/digikam-2.1.0-r2.ebuild b/media-gfx/digikam/digikam-2.3.0.ebuild similarity index 92% rename from media-gfx/digikam/digikam-2.1.0-r2.ebuild rename to media-gfx/digikam/digikam-2.3.0.ebuild index 701954717dbf..4866302c0ad7 100644 --- a/media-gfx/digikam/digikam-2.1.0-r2.ebuild +++ b/media-gfx/digikam/digikam-2.3.0.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-r2.ebuild,v 1.2 2011/10/19 19:11:12 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.3.0.ebuild,v 1.1 2011/11/12 15:52:28 dilfridge Exp $ EAPI=4 @@ -19,7 +19,7 @@ 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" +SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2" LICENSE="GPL-2 handbook? ( FDL-1.2 )" @@ -72,8 +72,6 @@ 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 diff --git a/media-gfx/digikam/files/digikam-2.0.0-tests-1.patch b/media-gfx/digikam/files/digikam-2.0.0-tests-1.patch deleted file mode 100644 index 298ce901ada8..000000000000 --- a/media-gfx/digikam/files/digikam-2.0.0-tests-1.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -ruN digikam-2.0.0.orig/core/tests/CMakeLists.txt digikam-2.0.0/core/tests/CMakeLists.txt ---- digikam-2.0.0.orig/core/tests/CMakeLists.txt 2011-07-28 01:28:08.000000000 +0200 -+++ digikam-2.0.0/core/tests/CMakeLists.txt 2011-07-31 21:47:05.000000000 +0200 -@@ -223,9 +223,13 @@ - - #------------------------------------------------------------------------ - --INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/threadimageio -- ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf -- ) -+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/threadimageio) -+ -+IF(PGF_FOUND) -+ INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS}) -+ELSE(PGF_FOUND) -+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf) -+ENDIF(PGF_FOUND) - - # Disable libpgf warnings. - SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w") -@@ -233,11 +237,20 @@ - SET(qtpgftest_SRCS qtpgftest.cpp ${libpgf_SRCS} ${pgfutils_SRCS}) - KDE4_ADD_EXECUTABLE(qtpgftest NOGUI ${qtpgftest_SRCS}) - TARGET_LINK_LIBRARIES(qtpgftest ${OPENMP_LDFLAGS} ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) -+IF(PGF_FOUND) -+ TARGET_LINK_LIBRARIES(qtpgftest ${PGF_LIBRARIES}) -+ENDIF(PGF_FOUND) - - SET(pgfscaled_SRCS pgfscaled.cpp ${libpgf_SRCS} ${pgfutils_SRCS}) - KDE4_ADD_EXECUTABLE(pgfscaled NOGUI ${pgfscaled_SRCS}) - TARGET_LINK_LIBRARIES(pgfscaled ${OPENMP_LDFLAGS} ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) -+IF(PGF_FOUND) -+ TARGET_LINK_LIBRARIES(pgfscaled ${PGF_LIBRARIES}) -+ENDIF(PGF_FOUND) - - SET(loadpgfdata_SRCS loadpgfdata.cpp ${libpgf_SRCS} ${pgfutils_SRCS}) - KDE4_ADD_EXECUTABLE(loadpgfdata NOGUI ${loadpgfdata_SRCS}) - TARGET_LINK_LIBRARIES(loadpgfdata ${OPENMP_LDFLAGS} ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) -+IF(PGF_FOUND) -+ TARGET_LINK_LIBRARIES(loadpgfdata ${PGF_LIBRARIES}) -+ENDIF(PGF_FOUND) diff --git a/media-gfx/digikam/files/digikam-2.0.0-underlinking.patch b/media-gfx/digikam/files/digikam-2.0.0-underlinking.patch deleted file mode 100644 index a5f05e08d3ce..000000000000 --- a/media-gfx/digikam/files/digikam-2.0.0-underlinking.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit 772f592f639f52d0c1a991265098b46672fecb6e -Author: Gilles Caulier -Date: Fri Aug 26 11:58:59 2011 +0200 - - Fix order to link gphoto2 library with digiKam shared lib. This must be the last on linker command line... - CCBUGS: 258931 - CCBUGS: 268267 - -diff --git a/digikam/CMakeLists.txt b/digikam/CMakeLists.txt -index 42017df..78ca1f1 100644 ---- a/digikam/CMakeLists.txt -+++ b/digikam/CMakeLists.txt -@@ -279,13 +279,15 @@ TARGET_LINK_LIBRARIES(digikam - - ${STRIGI_LIBRARIES} - ${LCMS_LIBRARIES} -- ${GPHOTO2_LIBRARIES} - - digikamcore - digikamdatabase - advancedrename - queuemanager - cameragui -+ -+ # See B.K.O #258931: libgphoto2 library must be the last arg for linker. -+ ${GPHOTO2_LIBRARIES} - ) - - IF (NOT WIN32 AND GPHOTO2_FOUND) -- 2.26.2