diff options
33 files changed, 87 insertions, 203 deletions
diff --git a/Documentation/package.keywords/kde-4.4.keywords b/Documentation/package.keywords/kde-4.4.keywords index 5a71263b260..e9868d3f27a 100644 --- a/Documentation/package.keywords/kde-4.4.keywords +++ b/Documentation/package.keywords/kde-4.4.keywords @@ -255,7 +255,6 @@ kde-base/kweather:4.4 kde-base/ark:4.4 kde-base/kcalc:4.4 kde-base/kcharselect:4.4 -kde-base/kdessh:4.4 kde-base/kdf:4.4 kde-base/kgpg:4.4 kde-base/ktimer:4.4 diff --git a/Documentation/package.keywords/kde-live.d/kdeutils-live b/Documentation/package.keywords/kde-live.d/kdeutils-live index b50169eaa0d..9c678ee4d19 100644 --- a/Documentation/package.keywords/kde-live.d/kdeutils-live +++ b/Documentation/package.keywords/kde-live.d/kdeutils-live @@ -1,7 +1,6 @@ ~kde-base/ark-9999 ** ~kde-base/kcalc-9999 ** ~kde-base/kcharselect-9999 ** -~kde-base/kdessh-9999 ** ~kde-base/kdf-9999 ** ~kde-base/kgpg-9999 ** ~kde-base/ktimer-9999 ** diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords index ff75dbf9466..d1f0661f8b9 100644 --- a/Documentation/package.keywords/kde-live.keywords +++ b/Documentation/package.keywords/kde-live.keywords @@ -270,7 +270,6 @@ ~kde-base/ark-9999 ** ~kde-base/kcalc-9999 ** ~kde-base/kcharselect-9999 ** -~kde-base/kdessh-9999 ** ~kde-base/kdf-9999 ** ~kde-base/kgpg-9999 ** ~kde-base/ktimer-9999 ** diff --git a/Documentation/package.unmask/kde-4.4 b/Documentation/package.unmask/kde-4.4 index 9d8935a0f5b..4e69ee74f7c 100644 --- a/Documentation/package.unmask/kde-4.4 +++ b/Documentation/package.unmask/kde-4.4 @@ -254,7 +254,6 @@ kde-base/kweather:4.4 kde-base/ark:4.4 kde-base/kcalc:4.4 kde-base/kcharselect:4.4 -kde-base/kdessh:4.4 kde-base/kdf:4.4 kde-base/kgpg:4.4 kde-base/ktimer:4.4 diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live index a41826c3baa..34c3b3f6f93 100644 --- a/Documentation/package.unmask/kde-live +++ b/Documentation/package.unmask/kde-live @@ -339,7 +339,6 @@ kde-base/kweather:live kde-base/ark:live kde-base/kcalc:live kde-base/kcharselect:live -kde-base/kdessh:live kde-base/kdf:live kde-base/kgpg:live kde-base/ktimer:live diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest index 431df89e1cc..d2b5ca72646 100644 --- a/dev-cpp/eigen/Manifest +++ b/dev-cpp/eigen/Manifest @@ -1,2 +1,2 @@ -EBUILD eigen-9999.ebuild 1476 RMD160 ec952f8ac32b471b5e555cc913881987756a12da SHA1 2e50c5110a0cca50b7e03a670c026333fd907986 SHA256 155c056e1bbbf14745435789f26c898529c0c997fa195cc5116668bbddc87a6b +EBUILD eigen-9999.ebuild 1504 RMD160 20b0c9889f4bd764e610d5c1d3797e6d64368d24 SHA1 84c1df8a704d91a600797d44e147896f0975c885 SHA256 2fae0a7ba693bcf00e1ff2d6f3e93eff96c43187573aa2b570f1b33c26cbea77 MISC metadata.xml 620 RMD160 5e24e438e3a9501381b1cab57dcaf29f8cff8374 SHA1 419bbd39ba071fb7ed3588903419ceadf9833a36 SHA256 35dc30130eccec1771de4dd1392b86fc2d6451bcac10babb0ccf5a5e71aad593 diff --git a/dev-cpp/eigen/eigen-9999.ebuild b/dev-cpp/eigen/eigen-9999.ebuild index eef210fd59b..68bada4a67a 100644 --- a/dev-cpp/eigen/eigen-9999.ebuild +++ b/dev-cpp/eigen/eigen-9999.ebuild @@ -16,13 +16,15 @@ KEYWORDS="" SLOT="3" IUSE="debug doc examples" -DEPEND=" +RDEPEND=" examples? ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 ) " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) +" S="${WORKDIR}/eigen" diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest index 784b6c4c5d2..53048ab2d21 100644 --- a/dev-util/kdevelop/Manifest +++ b/dev-util/kdevelop/Manifest @@ -1,4 +1,2 @@ -DIST kdevelop-3.9.97.tar.bz2 2415397 RMD160 88c1d655fb3e54235dfa3a3d9de8f53183cd1913 SHA1 79141abbc2fd98e5bb23c5262cff16321ba72b3e SHA256 9d53ab9656ffa2cdb8388424cc02143b0bfb8e68a9cea00335a658d41de95be4 -EBUILD kdevelop-3.9.97.ebuild 1842 RMD160 b5397c184ae73d8338399fc3d817ae46f3899b86 SHA1 14d1c67584a8650b7a2e322968507d373c121893 SHA256 34c11863e91ff285e5374921aee22874d0c1a506294bba297634d21b56182f37 -EBUILD kdevelop-9999.ebuild 1688 RMD160 cd23e67540a36c1d98cf86cf559548ce37fd88ca SHA1 14d78f75a34f17dc68c63b50043a35f7b67a1dd1 SHA256 452649aa12546bade4810234e89ba82c42a8010a45501e996cc79fd3c0a720a3 +EBUILD kdevelop-9999.ebuild 1946 RMD160 2bdb1e620666ef463dcdb3a6ae4268cad2c21097 SHA1 98ca48963aa66eedde09d1a590ccfd68029371b6 SHA256 55dca284169988265219c6b7f028219b4f269216dc2dd84ad134147d35f289b3 MISC metadata.xml 376 RMD160 93e6c292048eaf4c9a6510b167b6565f7a6ded38 SHA1 fc7c31107627f479cfedf13d0b89514e36840549 SHA256 6a5c6a78d5091e2045348ccb90057b68d3b6a25a17972779c4df81264650a602 diff --git a/dev-util/kdevelop/kdevelop-3.9.97.ebuild b/dev-util/kdevelop/kdevelop-3.9.97.ebuild deleted file mode 100644 index bf50d9e2cfe..00000000000 --- a/dev-util/kdevelop/kdevelop-3.9.97.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit kde4-base versionator - -KDEVPLATFORM_PV="$(($(get_major_version)-3)).$(get_after_major_version)" -DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages." -HOMEPAGE="http://www.kdevelop.org/" -SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2" -KEYWORDS="~amd64 ~hppa ~x86" -SLOT="4" -IUSE="+cmake +cxx debug +qmake qthelp" - -DEPEND=" - >=dev-util/kdevplatform-${KDEVPLATFORM_PV} - >=kde-base/ksysguard-${KDE_MINIMAL} - >=kde-base/libkworkspace-${KDE_MINIMAL} - qthelp? ( >=x11-libs/qt-assistant-4.4:4 ) -" -RDEPEND="${DEPEND} - >=kde-base/kapptemplate-${KDE_MINIMAL} -" - -src_prepare() { - kde4-base_src_prepare - - # Remove this and the ksysguard dep after libprocessui moved into kdelibs - sed -i -e 's/${KDE4WORKSPACE_PROCESSUI_LIBS}/processui/g' \ - debuggers/gdb/CMakeLists.txt \ - || die "Failed to patch CMake files" -} - -src_configure() { - mycmakeargs=( - $(cmake-utils_use_build cmake) - $(cmake-utils_use_build cmake cmakebuilder) - $(cmake-utils_use_build qmake) - $(cmake-utils_use_build qmake qmakebuilder) - $(cmake-utils_use_build qmake qmake_parser) - $(cmake-utils_use_build cxx cpp) - $(cmake-utils_use_build qthelp) - ) - - kde4-base_src_configure -} - -src_install() { - kde4-base_src_install - - rm "${D}/${PREFIX}"/share/apps/kdevappwizard/templates/qmake_qt4guiapp.tar.bz2 - rm "${D}/${PREFIX}"/share/icons/hicolor/22x22/actions/output_win.png -} - -pkg_postinst() { - kde4-base_pkg_postinst - - echo - elog "For extra functionality you shuold look at following packages:" - elog "dev-util/valgrind allows you to do memory leak check." - elog ">=sys-devel/gdb-7.0 (RECOMMENDED) required by debugger frontend." - echo -} diff --git a/dev-util/kdevelop/kdevelop-9999.ebuild b/dev-util/kdevelop/kdevelop-9999.ebuild index 0edb6d730c3..d01348e010b 100644 --- a/dev-util/kdevelop/kdevelop-9999.ebuild +++ b/dev-util/kdevelop/kdevelop-9999.ebuild @@ -7,8 +7,15 @@ EAPI="2" KMNAME="extragear/sdk" inherit kde4-base +if [[ ${PV} == *9999* ]]; then + KDEVPLATFORM_PV="9999" +else + inherit versionator + KDEVPLATFORM_PV="$(($(get_major_version)-3)).$(get_after_major_version)" +fi DESCRIPTION="Integrated Development Environment for Unix, supporting KDE/Qt, C/C++ and many other languages." HOMEPAGE="http://www.kdevelop.org/" +[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" KEYWORDS="" @@ -16,7 +23,7 @@ SLOT="4" IUSE="+cmake +cxx debug +qmake qthelp" DEPEND=" - >=dev-util/kdevplatform-9999 + >=dev-util/kdevplatform-${KDEVPLATFORM_PV} >=kde-base/ksysguard-${KDE_MINIMAL} >=kde-base/libkworkspace-${KDE_MINIMAL} qthelp? ( >=x11-libs/qt-assistant-4.4:4 ) diff --git a/dev-util/kdevplatform/Manifest b/dev-util/kdevplatform/Manifest index bb7aa20f6ca..7b5e668a57d 100644 --- a/dev-util/kdevplatform/Manifest +++ b/dev-util/kdevplatform/Manifest @@ -1,4 +1,2 @@ -DIST kdevplatform-0.9.97.tar.bz2 1008807 RMD160 033ff8cb652dba64c61d5317cfb2f28e132ef038 SHA1 93819d3b0201e2648035b5e137aaaf40ef65b8fe SHA256 c378900c6d96014fd48e4939883f2e2c4a29b8fadc5ea22bdf64216720d36401 -EBUILD kdevplatform-0.9.97.ebuild 1284 RMD160 628df4a616e00cb8e876b9d1fb6e791cd4df691d SHA1 8d8841f58bdafafd0b22abc8019659b766aaf267 SHA256 847ffb6119c0d1d8f0fb542281c28e095e91c500fd8ada59614b61b059de4a1f -EBUILD kdevplatform-9999.ebuild 1235 RMD160 fc8d44973afde63fe62896ccae17af3a734f8154 SHA1 7f3e59d9da307620424e56ba937e72b3836954e0 SHA256 21c7c29c543d72acbb0f2b6c978dfe932c6c26defbb7c5b08bd94c3a8661d73c +EBUILD kdevplatform-9999.ebuild 1551 RMD160 1850d7e079fa1f8c02b65e8263ea8383d427e109 SHA1 00a4db5b9fdf236ff5212e10683f3d7ad7836d75 SHA256 8efaa7fbeecc33d1995fccae346a43515de758d0267cf3aaf39199396950ba1b MISC metadata.xml 370 RMD160 415ffb51f442c372efbdcaee940254bccdef300a SHA1 f84d23dd0f900dcabab74a17f77d464fcbc5ca3f SHA256 32ee98d53944f32615ec51900aa79939effb944e30bd353560d0dcd61d09cd67 diff --git a/dev-util/kdevplatform/kdevplatform-0.9.97.ebuild b/dev-util/kdevplatform/kdevplatform-0.9.97.ebuild deleted file mode 100644 index b2c5c493598..00000000000 --- a/dev-util/kdevplatform/kdevplatform-0.9.97.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit kde4-base versionator - -KDEVELOP_PV="$(($(get_major_version)+3)).$(get_after_major_version)" -DESCRIPTION="KDE development support libraries and apps" -HOMEPAGE="http://www.kdevelop.org/" -SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_PV}/src/${P}.tar.bz2" - -LICENSE="GPL-2 LGPL-2" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" -SLOT="4" -# Moved to playground for now -# bazaar git -IUSE="cvs debug mercurial subversion" - -DEPEND=" - >=dev-libs/boost-1.35.0 - subversion? ( >=dev-util/subversion-1.3 ) -" -# Moved to playground for now -# bazaar? ( dev-util/bzr ) -# git? ( dev-util/git ) -# block - some plugins moved to kdevplatform from kdevelop -RDEPEND="${DEPEND} - cvs? ( dev-util/cvs ) - mercurial? ( dev-util/mercurial ) -" - -# Moved to playground for now -# $(cmake-utils_use_build bazaar) -# $(cmake-utils_use_build git) -src_configure() { - mycmakeargs=( - $(cmake-utils_use_build cvs) - $(cmake-utils_use_build mercurial) - $(cmake-utils_use_build subversion) - $(cmake-utils_use_with subversion SubversionLibrary) - ) - - kde4-base_src_configure -} - -src_install() { - kde4-base_src_install - - rm "${D}/${PREFIX}"/share/apps/cmake/modules/FindKDevPlatform.cmake -} diff --git a/dev-util/kdevplatform/kdevplatform-9999.ebuild b/dev-util/kdevplatform/kdevplatform-9999.ebuild index 97e422fa4ab..42879a94f54 100644 --- a/dev-util/kdevplatform/kdevplatform-9999.ebuild +++ b/dev-util/kdevplatform/kdevplatform-9999.ebuild @@ -7,8 +7,15 @@ EAPI="2" KMNAME="extragear/sdk" inherit kde4-base +if [[ ${PV} == *9999* ]]; then + KDEVELOP_PV="9999" +else + inherit versionator + KDEVELOP_PV="$(($(get_major_version)+3)).$(get_after_major_version)" +fi DESCRIPTION="KDE development support libraries and apps" HOMEPAGE="http://www.kdevelop.org/" +[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/unstable/kdevelop/${KDEVELOP_PV}/src/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2" KEYWORDS="" @@ -17,20 +24,29 @@ SLOT="4" # bazaar git IUSE="cvs debug kompare mercurial subversion" -DEPEND=" - >=dev-libs/boost-1.35.0 - kompare? ( >=kde-base/kompare-4.3.1 ) - subversion? ( >=dev-util/subversion-1.3 ) -" # Moved to playground for now # bazaar? ( dev-util/bzr ) # git? ( dev-util/git ) # block - some plugins moved to kdevplatform from kdevelop -RDEPEND="${DEPEND} - !<dev-util/kdevelop-3.9.96:4 +RDEPEND=" + !<dev-util/kdevelop-${KDEVELOP_PV} cvs? ( dev-util/cvs ) + kompare? ( >=kde-base/kompare-${KDE_MINIMAL} ) mercurial? ( dev-util/mercurial ) + subversion? ( >=dev-util/subversion-1.3 ) " +DEPEND="${RDEPEND} + dev-libs/boost +" + +src_prepare() { + kde4-base_src_prepare + + # FindKDevPlatform.cmake is installed by kdelibs + sed -i \ + -e '/cmakeFiles/s/^/#DONOTINSTALL/' \ + cmake/CMakeLists.txt || die +} # Moved to playground for now # $(cmake-utils_use_build bazaar) @@ -46,9 +62,3 @@ src_configure() { kde4-base_src_configure } - -src_install() { - kde4-base_src_install - - rm "${D}/${PREFIX}"/share/apps/cmake/modules/FindKDevPlatform.cmake -} diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest index 9252917db91..d20acb86e0a 100644 --- a/kde-base/kdelibs/Manifest +++ b/kde-base/kdelibs/Manifest @@ -16,5 +16,5 @@ AUX kdelibs-4.3.80-module-suffix.patch 3919 RMD160 ed225d685594d53df9792b1472925 DIST kdelibs-4.3.85.tar.bz2 13006399 RMD160 a7bf23d5e3d8d3379aedab831c9372d32a7be3f1 SHA1 ecb6a1016e867be95630f91d4ae0cadd386d507b SHA256 2df0d9cf9ebd6cacee6bc667585c621cc006213effd993a280fa26f651792cc4 EBUILD kdelibs-4.3.85.ebuild 9120 RMD160 01c3631c3d67dc5a3a2fe9bf681d1e51e85a8f58 SHA1 65eaa3c4e275412a4f7e444a62d01c78b2c88185 SHA256 68e26ca0dac5f4c93f8108ee1c17e963f82c968bb9b84a123d4ae57076b91b08 EBUILD kdelibs-4.3.9999.ebuild 8845 RMD160 64ab6bb49e4032602bb37fd5ede3f38a2396430b SHA1 7c13f808427018d4667cd6fc218e64b0eaf50cd0 SHA256 fa0b683d0cdced0bf4767b7a32fc4ae5ec22d798e1069f3b7a052be10e7e3715 -EBUILD kdelibs-9999.ebuild 8816 RMD160 c081362f52d36e5933881bde862a9947ad019262 SHA1 16d6f13ce1421d23ebb5e93c3fbe633f2b4682d2 SHA256 030a2d49df6549bc9e787deb7a6296485a8db00165f0e9db24e3cfcef126726f +EBUILD kdelibs-9999.ebuild 8899 RMD160 bcc089e17842cdc218761b57114f7904d941ed0f SHA1 9cc9a73c72724da6c603db1e957a3da1d9518fb1 SHA256 899a7280cec1ad4f4f7e005f2a0072f6de915b21dc067b1e8d2342f5c2ef2802 MISC metadata.xml 374 RMD160 18c1efe3720891a6e37eea57b1a3ea5d31353174 SHA1 0a4b4de13c94ad5bcd7e9790f023f0274f979ca0 SHA256 1d1a0ee494881f69a23c3416e04de031e504bb84f0886095668396c7a1a4625a diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild index 0988057c714..f4abeb497d5 100644 --- a/kde-base/kdelibs/kdelibs-9999.ebuild +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -27,7 +27,6 @@ COMMONDEPEND=" dev-libs/libpcre dev-libs/libxml2 dev-libs/libxslt - >=dev-libs/soprano-2.3.70[dbus,raptor,redland] >=kde-base/automoc-0.9.87 media-libs/fontconfig media-libs/freetype:2 @@ -68,8 +67,11 @@ COMMONDEPEND=" media-libs/openexr media-libs/ilmbase ) - policykit? ( sys-auth/policykit-qt ) - semantic-desktop? ( >=dev-libs/shared-desktop-ontologies-0.2 ) + policykit? ( sys-auth/polkit-qt ) + semantic-desktop? ( + >=dev-libs/shared-desktop-ontologies-0.2 + >=dev-libs/soprano-2.3.70[dbus,raptor,redland] + ) spell? ( app-dicts/aspell-en app-text/aspell @@ -197,6 +199,7 @@ src_configure() { mycmakeargs+=( -DWITH_HSPELL=OFF -DKDE_DEFAULT_HOME=${HME} + -DKAUTH_BACKEND=POLKITQT-1 $(cmake-utils_use_build handbook doc) $(cmake-utils_use_has 3dnow X86_3DNOW) $(cmake-utils_use_has altivec PPC_ALTIVEC) @@ -213,7 +216,8 @@ src_configure() { $(cmake-utils_use_with nls Libintl) $(cmake-utils_use_with openexr OpenEXR) $(cmake-utils_use_with opengl OpenGL) - $(cmake-utils_use_with policykit PolkitQt) + $(cmake-utils_use_with policykit PolkitQt-1) + $(cmake-utils_use_with semantic-desktop Soprano) $(cmake-utils_use_with semantic-desktop SharedDesktopOntologies) $(cmake-utils_use_with spell ASPELL) $(cmake-utils_use_with spell ENCHANT) diff --git a/kde-base/kdelirc/Manifest b/kde-base/kdelirc/Manifest index 12c429e6f26..8bf9c2fea12 100644 --- a/kde-base/kdelirc/Manifest +++ b/kde-base/kdelirc/Manifest @@ -1,5 +1,5 @@ DIST kdeutils-4.3.85.tar.bz2 2626535 RMD160 9a8abb994044362d1026ae447255d5d59b0b77d5 SHA1 5318c5806eee298045b4d131c81e38ff13f00ed4 SHA256 838c9129a03c6b4abe6c17919f93c2923525b09e5ec7872369bae2cb6ed16994 EBUILD kdelirc-4.3.85.ebuild 384 RMD160 2e6af327569eff4e897ec724aab687105b1412d7 SHA1 7c481852ff131b92dc16373a28dc28044d1dd31a SHA256 6572e1260efe41b2548ad684a9b5f864505bb5f38a333980502bb7e5a5d3850b EBUILD kdelirc-4.3.9999.ebuild 322 RMD160 27efd5b4b13cdcc2f151caf9b41cc5ca44b61c3f SHA1 717f5fe4dceff551809507a4d153f3f1880bb25c SHA256 277fee0032ddd7285b587acb59998c53ae22617a02698a8db226a0d9d5b5280f -EBUILD kdelirc-9999.ebuild 368 RMD160 edfc6f1f9329304d034325df148058866b71c3c5 SHA1 a190bb282e9268e1ac25091f00f2cb6074ef4383 SHA256 18ea11186ab0aa2649f218cbd61ff1e7336275b0274c4a222649a637a6794e75 +EBUILD kdelirc-9999.ebuild 555 RMD160 eb6935e207d1251f4405c1908a00d4d74f492114 SHA1 44a8f899ebee43d6998bb90081d6ce1c57c4c14a SHA256 7ab4706d346f5dd2440c614dc27ae539359964efd42e7d0bf001969dadf60863 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kdelirc/kdelirc-9999.ebuild b/kde-base/kdelirc/kdelirc-9999.ebuild index 5351024e1f8..2f363246558 100644 --- a/kde-base/kdelirc/kdelirc-9999.ebuild +++ b/kde-base/kdelirc/kdelirc-9999.ebuild @@ -18,3 +18,11 @@ RDEPEND="${DEPEND} !kde-misc/kdelirc app-misc/lirc " + +src_prepare() { + kde4-meta_src_prepare + + sed -e 's:${KDE4WORKSPACE_SOLIDCONTROL_LIBRARY}:solidcontrol:g' \ + -i kdelirc/{kcmlirc,kdelirc,irkick}/CMakeLists.txt \ + || die "sed failed" +} diff --git a/kde-base/kdessh/Manifest b/kde-base/kdessh/Manifest index 746b51a9f8c..efd10b36fd2 100644 --- a/kde-base/kdessh/Manifest +++ b/kde-base/kdessh/Manifest @@ -1,5 +1,2 @@ -DIST kdeutils-4.3.85.tar.bz2 2626535 RMD160 9a8abb994044362d1026ae447255d5d59b0b77d5 SHA1 5318c5806eee298045b4d131c81e38ff13f00ed4 SHA256 838c9129a03c6b4abe6c17919f93c2923525b09e5ec7872369bae2cb6ed16994 -EBUILD kdessh-4.3.85.ebuild 299 RMD160 571a5c7ff1593ae500d8666f1b2dafc110ea9bb8 SHA1 e95b6ec8f4a0f80197998ccc433489a93875af27 SHA256 d31ca3c144d72036822dae5bf75984ecd147c9ce6f5e424441dc5de5dc92b545 EBUILD kdessh-4.3.9999.ebuild 250 RMD160 1889711b417095ae302a5c6f9911bc86ae3c8c45 SHA1 5d479bd31d6c2606e89694fb82c8ac9ee6e652f3 SHA256 faf57e5710fa1c42a903edf6e9bd1378c219278cf78573ce2eb2c479583a6113 -EBUILD kdessh-9999.ebuild 250 RMD160 1889711b417095ae302a5c6f9911bc86ae3c8c45 SHA1 5d479bd31d6c2606e89694fb82c8ac9ee6e652f3 SHA256 faf57e5710fa1c42a903edf6e9bd1378c219278cf78573ce2eb2c479583a6113 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/kdessh/kdessh-4.3.85.ebuild b/kde-base/kdessh/kdessh-4.3.85.ebuild deleted file mode 100644 index a5d594c7fc3..00000000000 --- a/kde-base/kdessh/kdessh-4.3.85.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -KMNAME="kdeutils" -inherit kde4-meta - -DESCRIPTION="KDE frontend to ssh" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug" - -RDEPEND="virtual/ssh" diff --git a/kde-base/kdessh/kdessh-9999.ebuild b/kde-base/kdessh/kdessh-9999.ebuild deleted file mode 100644 index 75642066aad..00000000000 --- a/kde-base/kdessh/kdessh-9999.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -KMNAME="kdeutils" -inherit kde4-meta - -DESCRIPTION="KDE frontend to ssh" -KEYWORDS="" -IUSE="debug" - -RDEPEND="virtual/ssh" diff --git a/kde-base/kdeutils-meta/Manifest b/kde-base/kdeutils-meta/Manifest index 9be52dc2b8a..9cb390a8548 100644 --- a/kde-base/kdeutils-meta/Manifest +++ b/kde-base/kdeutils-meta/Manifest @@ -1,4 +1,4 @@ -EBUILD kdeutils-meta-4.3.85.ebuild 844 RMD160 1dd13f00d52a6e630500dbd74a6780c26f51da52 SHA1 619b444af7ec66a10808e0babbb6620a5091ef15 SHA256 50ce3d3e785c5e05517b9111eeb084ceeb788b77996f22843a20d7b065b20ff2 +EBUILD kdeutils-meta-4.3.85.ebuild 817 RMD160 d7366d96776a887e57d8b7d70def5fc335dcf178 SHA1 641e1015aaa9dca0fe1320da8dc8e09a5ab717bd SHA256 b9682b1c70ab2da835a0c16cedda68be3a4a3ff2d7b41ede3af098db800b6fe5 EBUILD kdeutils-meta-4.3.9999.ebuild 795 RMD160 f902365c1c57155b8425099fb6b71fe8a4c691aa SHA1 c707b5576ae91d51e1d519f99596566a37e10674 SHA256 bdbbe0f9cd6d9836be42af07736eb3f779a866895c59be8582c442b38fc8f6bc -EBUILD kdeutils-meta-9999.ebuild 796 RMD160 a9701b65d837f4d3782c534214cfa8b2c8b6b723 SHA1 baebfabbef4bc70fee6286fa4b74b9c6b3bf7690 SHA256 8ea57e41a496ef0e3063a5ee724cf3da232b2273c6b0df96817b01fabf60e45d +EBUILD kdeutils-meta-9999.ebuild 769 RMD160 1cc22602e247d672a03cb7101d2c55212317af15 SHA1 ae7e8849cf4692dc603c28913e8a03a910434ee4 SHA256 27d80c5a73fcdfe155e129c85486942679dffc430a734ca56ac0950a22452276 MISC metadata.xml 293 RMD160 2302a986e6497734cd18fceeaeacf54f771824c1 SHA1 2d8ceccf49c92609ef64a14f32b3c435ffc9ceae SHA256 1f2a361e526eed57b112847253fb614a22d9cbed4d6f6207dc06ddb652883b89 diff --git a/kde-base/kdeutils-meta/kdeutils-meta-4.3.85.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-4.3.85.ebuild index 1b10050952f..321a8c741cd 100644 --- a/kde-base/kdeutils-meta/kdeutils-meta-4.3.85.ebuild +++ b/kde-base/kdeutils-meta/kdeutils-meta-4.3.85.ebuild @@ -17,7 +17,6 @@ RDEPEND=" $(add_kdebase_dep ark) $(add_kdebase_dep kcalc) $(add_kdebase_dep kcharselect) - $(add_kdebase_dep kdessh) $(add_kdebase_dep kdf) $(add_kdebase_dep kgpg) $(add_kdebase_dep ktimer) diff --git a/kde-base/kdeutils-meta/kdeutils-meta-9999.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-9999.ebuild index 00972d6a242..4af3b709d39 100644 --- a/kde-base/kdeutils-meta/kdeutils-meta-9999.ebuild +++ b/kde-base/kdeutils-meta/kdeutils-meta-9999.ebuild @@ -17,7 +17,6 @@ RDEPEND=" $(add_kdebase_dep ark) $(add_kdebase_dep kcalc) $(add_kdebase_dep kcharselect) - $(add_kdebase_dep kdessh) $(add_kdebase_dep kdf) $(add_kdebase_dep kgpg) $(add_kdebase_dep ktimer) diff --git a/kde-base/ksirk/Manifest b/kde-base/ksirk/Manifest index 9034cbf3d59..89db305ebf8 100644 --- a/kde-base/ksirk/Manifest +++ b/kde-base/ksirk/Manifest @@ -1,6 +1,6 @@ AUX ksirk-4.2.1-freebsd-darwin.patch 443 RMD160 a60e231de29b89c5af2c34c5e97d550777249bd1 SHA1 ad420561310fe409e66b0cc2d37bbc8ab01f7a6c SHA256 70c4ce17000c51e6190fc49c4b44b27aa78e8008fbcbf333804a0c8238e07268 DIST kdegames-4.3.85.tar.bz2 69945159 RMD160 3a6e749e4766eb047470bb2488f9d8e353f8f75d SHA1 f245386dd4bbec4e39261280f25a0e1f405e357d SHA256 13257185664aebd8d76c456bae7e0d54b0a74676538ca0b2753294dab5e48d97 -EBUILD ksirk-4.3.85.ebuild 424 RMD160 d1f5ed86a0676cc81880ec659c83cde38a00a807 SHA1 5a079593d86a7912377c6f185f7dc371969b3577 SHA256 77b2794001facc396d478d00ce764d4d8ec31a1e58ad6c975cf8be0d4304ba72 +EBUILD ksirk-4.3.85.ebuild 363 RMD160 a0539af71c2d8246fea5c0db610c404a2b2ffa08 SHA1 71eefe517a84f82c6ef0cab4fec87b3e25d991d4 SHA256 f17cfdde293830df6b1d8dc8c71dda41bb7495968733b88859aa149021c2ca8b EBUILD ksirk-4.3.9999.ebuild 375 RMD160 8894cbb348ba34b1538dffaaec2574eca8d366b3 SHA1 24074d2ff9a681e4cad65a654e48984a1d33b563 SHA256 66225f4fad4834009004f6be04d3e6983552b28e9cb24ad240da72ccc39203d2 EBUILD ksirk-9999.ebuild 314 RMD160 dd3b29a93f450dbce2b76ef4b880fd8ff902a1ef SHA1 85bd43f352627921c6c8c8318cd1a3bd1797b46a SHA256 b00639422c7c9232a0af23f2a683c15eb91ee4afa09ec16a4d7a69c2bafd7a54 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/kde-base/ksirk/ksirk-4.3.85.ebuild b/kde-base/ksirk/ksirk-4.3.85.ebuild index 2f70385b82f..913bbb5fec5 100644 --- a/kde-base/ksirk/ksirk-4.3.85.ebuild +++ b/kde-base/ksirk/ksirk-4.3.85.ebuild @@ -15,7 +15,3 @@ DEPEND=" app-crypt/qca:2 " RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.2.1-freebsd-darwin.patch" -) diff --git a/kde-base/phonon-kde/Manifest b/kde-base/phonon-kde/Manifest index a73649da1fe..651341e0676 100644 --- a/kde-base/phonon-kde/Manifest +++ b/kde-base/phonon-kde/Manifest @@ -1,4 +1,4 @@ -AUX phonon-kde-4.3.4-optional-alsa.patch 738 RMD160 d1f7eee14c9ab924bf8f0b7dd8abca246f52f7c5 SHA1 4854176d7e98b15c5863f6fecaf10d7bfb3b5722 SHA256 f5b8154eff091b432cdd002a2a4145ddf173dcc6d3bf91a5ef0a14d5e61036ee +AUX phonon-kde-4.3.4-optional-alsa.patch 768 RMD160 f1ecfdc3fa256a74144387aeb367ae92844c8da8 SHA1 3d1dd78caf07c92b192237a89037c8e4afde1a91 SHA256 c4fef73f2458da524452ef9e9b7d2e42b11e508b8eedc5ed6c9b296155290285 DIST kdebase-runtime-4.3.85.tar.bz2 7393556 RMD160 0e9e1e5a40ecd51ed3ee032841705c58c8379eb0 SHA1 fa94dafb38a7d8c6b2a4df470904b86156f4fd78 SHA256 be5ce3a99e791a39f669a5d823468fb719aebb860af80704018f6bf419abbce2 EBUILD phonon-kde-4.3.85.ebuild 1001 RMD160 c4ca75142f27c50a0dbc2026df7fc70348d722fe SHA1 d5f037cf1bd4faa533d5840984c657e42491f07d SHA256 c274f4616e869a597986ab37d72afd39b4849ca3a0d842e70a2a8652a51798a0 EBUILD phonon-kde-4.3.9999.ebuild 1067 RMD160 825e696f5cbb55e15a1ad7cacfda5cdf90ced9e9 SHA1 704f16a5b229f869d6b1b0da4ba22741bc1ff7c8 SHA256 13d7ba22956a799ecc57e0ceb6b3efbebb27a6ac251c250a1a9af6f52f63bc3a diff --git a/kde-base/phonon-kde/files/phonon-kde-4.3.4-optional-alsa.patch b/kde-base/phonon-kde/files/phonon-kde-4.3.4-optional-alsa.patch index adc87db3fba..8c28fd4db09 100644 --- a/kde-base/phonon-kde/files/phonon-kde-4.3.4-optional-alsa.patch +++ b/kde-base/phonon-kde/files/phonon-kde-4.3.4-optional-alsa.patch @@ -8,10 +8,10 @@ + option(WITH_ALSA "Use ALSA, if found" ON) + if(NOT WITH_ALSA) + message(STATUS "Disabling ALSA support, by request") -+ set(ALSA_FOUND) -+ set(ASOUND_LIBRARY) -+ set(HAVE_LIBASOUND2) -+ set(ALSA_INCLUDES) ++ set(ALSA_FOUND FALSE) ++ set(ASOUND_LIBRARY NOTFOUND) ++ set(HAVE_LIBASOUND2 FALSE) ++ set(ALSA_INCLUDES NOTFOUND) + endif(NOT WITH_ALSA) + ALSA_CONFIGURE_FILE(${CMAKE_CURRENT_BINARY_DIR}/config-alsa.h) diff --git a/net-im/choqok/Manifest b/net-im/choqok/Manifest index 30b1e90593a..68dcd95c49f 100644 --- a/net-im/choqok/Manifest +++ b/net-im/choqok/Manifest @@ -1,4 +1,5 @@ +AUX choqok-fix-mediamanager-sigsegv.patch 700 RMD160 04dc825f65746653031c63bca640ad7cc91721a5 SHA1 c7fbf9db1be37a660cf8938e52e637345eee7e24 SHA256 1b855f6b61c653f2e57525f65a0ffad280a4b670ab38d21910224db3244433d6 DIST choqok-0.9.4.tar.bz2 258911 RMD160 cb50dfe4dff826a1feaf59b297cc795a1aabe4c7 SHA1 ff3a6dcab108fe4461a75e4068bc574f4634b776 SHA256 3048ab9d6a6e5e8ad258e38bf34d8dc5f4215cbab364720942de32e3e69792b1 -EBUILD choqok-0.9.4.ebuild 479 RMD160 1fd1bc024ff743fdb5149a8125307e1f06ac8aef SHA1 cd4b590d46067499b59d4e9caa02dabd66ef64c7 SHA256 07b0c165a8c90a45b34131a8a7393299c74128cdeef71fdf0faa82fea281b913 +EBUILD choqok-0.9.4-r1.ebuild 542 RMD160 16a52756b3369b4c9f59a7a76b1a74eb2fb12f31 SHA1 25f1ea1507ce46988415bae9331a6f18b8ed6009 SHA256 422c4916207b424676d66e1d9c25f758b66846ce912e5bfcd00f17667ff2cae1 EBUILD choqok-9999.ebuild 330 RMD160 2a06a0f2fd530e99515ca492bd957b4322d1f04d SHA1 fe9c2bfe778c142a9455dcf908e129392bf7366a SHA256 72664dc068f9052315acb6d0874ef5c298ec3266975be3fd241a864003953f71 MISC metadata.xml 158 RMD160 f15477b4ffb8ae0849cbae52329d1bdf99a407f4 SHA1 18cd6cdb98f781c3975c49f300d3f8b1e07333b8 SHA256 b5a2d16139d03b8af578bc87503b14b589dd7e3544d879297ccdb735d35a02e2 diff --git a/net-im/choqok/choqok-0.9.4.ebuild b/net-im/choqok/choqok-0.9.4-r1.ebuild index f75d407b894..03c03b42782 100644 --- a/net-im/choqok/choqok-0.9.4.ebuild +++ b/net-im/choqok/choqok-0.9.4-r1.ebuild @@ -15,3 +15,5 @@ LICENSE="GPL-3" KEYWORDS="~amd64 ~x86" SLOT="4" IUSE="debug" + +PATCHES=( "${FILESDIR}"/${PN}-fix-mediamanager-sigsegv.patch )
\ No newline at end of file diff --git a/net-im/choqok/files/choqok-fix-mediamanager-sigsegv.patch b/net-im/choqok/files/choqok-fix-mediamanager-sigsegv.patch new file mode 100644 index 00000000000..d2ea94dd9ca --- /dev/null +++ b/net-im/choqok/files/choqok-fix-mediamanager-sigsegv.patch @@ -0,0 +1,19 @@ +Author: Dario Andres + +https://bugs.gentoo.org/show_bug.cgi?id=298806 +https://bugs.kde.org/show_bug.cgi?id=211016 + +Index: libchoqok/mediamanager.cpp +=================================================================== +--- libchoqok/mediamanager.cpp (revision 1063057) ++++ libchoqok/mediamanager.cpp (working copy) +@@ -120,7 +120,8 @@ + emit fetchError( remote, errMsg ); + } else { + QPixmap p; +- if( p.loadFromData( baseJob->data() ) ) { ++ if( !baseJob->data().startsWith(QByteArray("<?xml version=\"")) && ++ p.loadFromData( baseJob->data() ) ) { + d->cache.insert( remote, p ); + emit imageFetched( remote, p ); + } else { diff --git a/profiles/package.mask b/profiles/package.mask index b93db528111..d55950cca44 100644 --- a/profiles/package.mask +++ b/ |