From e8fd929eef99fcff9d1fdf6f08d2e47706d61124 Mon Sep 17 00:00:00 2001 From: geos_one Date: Tue, 2 Jun 2009 06:50:59 +0000 Subject: [PATCH] delete amarok liveebuilds git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1291 6952d904-891a-0410-993b-d76249ca496b --- app-emulation/open-vm-tools/Manifest | 3 +- .../open-vm-tools-2009.05.22_p167859.ebuild | 1 + eclass/vmware-1.eclass | 19 +- media-sound/amarok/ChangeLog | 125 ------------- media-sound/amarok/Manifest | 9 - media-sound/amarok/amarok-2.0.2.ebuild | 104 ----------- .../amarok/amarok-2.1.0_pre20090502.ebuild | 88 --------- media-sound/amarok/files/2.0.1.1-ipod.patch | 175 ------------------ .../amarok/files/amarok-2.0.2-librt-1.patch | 18 -- media-sound/amarok/files/amarok-ipod.patch | 159 ---------------- .../amarok/files/disable_bindings_test.patch | 12 -- media-sound/amarok/metadata.xml | 54 ------ 12 files changed, 19 insertions(+), 748 deletions(-) delete mode 100644 media-sound/amarok/ChangeLog delete mode 100644 media-sound/amarok/Manifest delete mode 100644 media-sound/amarok/amarok-2.0.2.ebuild delete mode 100644 media-sound/amarok/amarok-2.1.0_pre20090502.ebuild delete mode 100644 media-sound/amarok/files/2.0.1.1-ipod.patch delete mode 100644 media-sound/amarok/files/amarok-2.0.2-librt-1.patch delete mode 100644 media-sound/amarok/files/amarok-ipod.patch delete mode 100644 media-sound/amarok/files/disable_bindings_test.patch delete mode 100644 media-sound/amarok/metadata.xml diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest index 8294fad2..6a7d7d4f 100644 --- a/app-emulation/open-vm-tools/Manifest +++ b/app-emulation/open-vm-tools/Manifest @@ -2,7 +2,8 @@ AUX default-scripts.patch 3525 RMD160 7c3dfd342be245531493a9cf7a8be2be4c67dc4b S AUX open-vm-tools.desktop 127 RMD160 375ec8cd688a5fe0609076798e515c048be81c15 SHA1 6b6adcb93fbcb11e1638d6a80b3828256f880dcf SHA256 7cb78f0d94f1849aa964bc8e9d9a6c49955ba1a9b937174b1c266a9cc8eb4bc3 AUX open-vm.confd 88 RMD160 5e398024e72a871f258d73e09f02e37a815443b0 SHA1 56133c21c6d29243ac81a9c1ada61616778f3ce2 SHA256 180a2b6d9d18af319b79b2ca6ebf1020b63e5ebf2f601a63c1a9f9f7d2e0b95c AUX open-vm.initd 1875 RMD160 9d2cc36fd93e70ae20eecd49b10c4da0e09aad69 SHA1 1702f267d32ca138e0e99d9ed86b4abc32cc3997 SHA256 1799b78836441b389de0b3d92aad80fcf020fe8b57da4f6d6999f86ee87f51bf +AUX wiper-warning-fix.patch 418 RMD160 d3595ca361e1b330e22ec10b33b19813df94ff82 SHA1 ff644d5fa4e5d4e5017ce843cd09ab282e4dcd9a SHA256 3678c0ab683336e645a0c2e1c2167ad6fd094784722b63c6e66c435d685ed712 DIST open-vm-tools-2009.05.22-167859.tar.gz 3417843 RMD160 c8403e0fe1ff32ec356ce997b7e621ee7fe87d22 SHA1 a38e16e8cc6bb3b9d9ce88244aef8332a233b7e4 SHA256 99f3726f86e53abac4efcf70a871e2003d2f245fd83b663ae8ad756322c48a2b -EBUILD open-vm-tools-2009.05.22_p167859.ebuild 2116 RMD160 0a921405c63c8641babc0e384962a779ec07a522 SHA1 3c6534024ed6a88d73082d2e71c6b6190f4c3a99 SHA256 774a3fd8f1f43076f3801c1c33fffd8761ac08160a6e569c634140e66046e56b +EBUILD open-vm-tools-2009.05.22_p167859.ebuild 2162 RMD160 d96c4bd398e7653e9182083562bab859714ba57a SHA1 b043c9c861625735839d8c93a6b1f30ea2a17b80 SHA256 18afe757ae55b041ffee6d5d4c6a8116db4cecea9815645dcd7d90258ace8ab5 MISC ChangeLog 851 RMD160 85dd87325a0294d1a6268e9382429e53f691d749 SHA1 86123884ec7e16958fb50c0a3bc8341eeb832871 SHA256 96c8325fcaf9bf629f28afc1e97eb6e1f1a09e78f9e80e2c7d1ee97c9a6f847d MISC metadata.xml 273 RMD160 868f3e6ce2b19d6874be333eb73f9320df75605f SHA1 a5fa804bbe72aee73c241218da87736c81ff3815 SHA256 3528eb8ce4ae248c296a08cd9c3d252fbb4421fe5369ec3b5353b3c4f0da025d diff --git a/app-emulation/open-vm-tools/open-vm-tools-2009.05.22_p167859.ebuild b/app-emulation/open-vm-tools/open-vm-tools-2009.05.22_p167859.ebuild index 54c49983..d06c0474 100644 --- a/app-emulation/open-vm-tools/open-vm-tools-2009.05.22_p167859.ebuild +++ b/app-emulation/open-vm-tools/open-vm-tools-2009.05.22_p167859.ebuild @@ -65,6 +65,7 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}/default-scripts.patch" + epatch "${FILESDIR}/wiper-warning-fix.patch" } src_configure() { diff --git a/eclass/vmware-1.eclass b/eclass/vmware-1.eclass index 19ebb3a3..35a77787 100644 --- a/eclass/vmware-1.eclass +++ b/eclass/vmware-1.eclass @@ -80,11 +80,26 @@ else SRC_URI="${SRC_URI_ROOT}${VM_SRC}" fi +# scan for genpatches and if also amd64 packages are present then put the package into x86 if [[ -n "${VM_SRC_EXTRA}" ]] then for a in ${VM_SRC_EXTRA} do - SRC_URI="${SRC_URI} http://ftp.mars.arge.at/vmware/${P/_p/-}-${a}.tar.bz2" + if [[ -n ${VM_SRC_EXTRA64} ]] + then + SRC_URI="${SRC_URI} x86? ( http://ftp.mars.arge.at/vmware/${P/_p/-}-${a}.tar.bz2 )" + else + SRC_URI="${SRC_URI} http://ftp.mars.arge.at/vmware/${P/_p/-}-${a}.tar.bz2" + fi + done +fi + +# now also add the amd64 packages +if [[ -n "${VM_SRC_EXTRA64}" ]] +then + for a in ${VM_SRC_EXTRA64} + do + SRC_URI="${SRC_URI} amd64? ( http://ftp.mars.arge.at/vmware/${P/_p/-}-${a}.tar.bz2 )" done fi @@ -94,8 +109,6 @@ RESTRICT="strip mirror" SLOT="0" DEPEND="x11-misc/shared-mime-info" -#if [ -z "${VM_SRC}" ] && die "Buggy ebuild plz define VM_SRC" - vmware-1_determine_product export VMWARE_GROUP=${VMWARE_GROUP:-vmware} diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog deleted file mode 100644 index b83bc0d6..00000000 --- a/media-sound/amarok/ChangeLog +++ /dev/null @@ -1,125 +0,0 @@ -# ChangeLog for media-sound/amarok -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - -*amarok-2.1.0_pre20090502 (02 May 2009) - - 02 May 2009; Mario Fetka - +amarok-2.1.0_pre20090502.ebuild, +files/amarok-ipod.patch, - +files/disable_bindings_test.patch: - new revison - -*amarok-2.0.2 (05 Mar 2009) - - 05 Mar 2009; Alexey Shvetsov +amarok-2.0.2.ebuild: - Bump - - 05 Feb 2009; Maciej Mrozowski (reavertm) - metadata.xml, amarok-9999.ebuild: - Added missing [kdeprefix=] USE deps in amarok, reformatting - - 12 Jan 2009; Manuel Nickschas - amarok-2.0.1.1.ebuild: - Remove unused USE - -*amarok-2.0.1.1 (12 Jan 2009) - - 12 Jan 2009; Manuel Nickschas - +amarok-2.0.1.1.ebuild: - Bump - -*amarok-2.0-r1 (27 Dec 2008) - - 27 Dec 2008; Alexey Shvetsov -amarok-1.98.ebuild, - +amarok-2.0-r1.ebuild, -amarok-2.0.ebuild: - Remove unneeded src_install - - 28 Nov 2008; Manuel Nickschas - amarok-9999.ebuild: - Prefer mysql over mysql-community. Amarok works fine with either one, but - portage seems to suggest only the first of them, and that confuses users. - - 27 Nov 2008; Maciej Mrozowski (reavertm) - amarok-9999.ebuild: - Files no longer installed in trunk, fixed KEYWORDS for tagged amarok - -*amarok-1.98 (21 Nov 2008) - - 21 Nov 2008; Alexey Shvetsov -amarok-1.94.ebuild, - +amarok-1.98.ebuild: - Version bump - - 16 Nov 2008; Theo Chatzimichos ChangeLog: - fix collisions for snapshots, bug 246639 - - 05 Nov 2008; Theo Chatzimichos ChangeLog: - fix collisions with kdelibs and plasma-workspace - - 05 Nov 2008; Manuel 'Sput' Nickschas - amarok-9999.ebuild: - Update amd64 -fPIC warning - - 04 Nov 2008; Manuel 'Sput' Nickschas - amarok-9999.ebuild: - libplasma move to kdelibs - -*amarok-1.94 (01 Nov 2008) - - 01 Nov 2008; -amarok-1.92.2.ebuild, - +amarok-1.94.ebuild: - Version bump - - 30 Oct 2008; Theo Chatzimichos ChangeLog: - small fixes - - 29 Oct 2008; Theo Chatzimichos ChangeLog: - small fix - - 29 Oct 2008; ChangeLog: - importing live ebuild - - 10 Oct 2008; Jorge Manuel B. S. Vicetto - -amarok-1.90.ebuild: - Removed amarok-1.90 as it was put in the tree. - - 06 Oct 2008; amarok-1.90.ebuild, amarok-1.92.2.ebuild: - update NEED_KDE to use slots instead of versions - -*amarok-1.92.2 (03 Oct 2008) - - 03 Oct 2008; Tomáš Chvátal - +amarok-1.92.2.ebuild, -amarok-1.92.ebuild: - Again do version bump. - -*amarok-1.92 (03 Oct 2008) - - 03 Oct 2008; Tomáš Chvátal - +amarok-1.92.ebuild: - Bump new version. - - 02 Oct 2008; Jorge Manuel B. S. Vicetto - metadata.xml: - Added missing use flags descriptions to metadata.xml. - - 27 Sep 2008; Tomas Chvatal (scarabeus) - amarok-1.90.ebuild: - Move ebuild towards EAPI2 compilance - - 27 Aug 2008; Jorge Manuel B. S. Vicetto - amarok-1.90.ebuild: - Fixed alphabetical order in KEYWORDS and deps. - - 25 Aug 2008; Manuel Nickschas (Sput) - amarok-1.90.ebuild: - Keyword ~amd64 - - 22 Aug 2008; Manuel Nickschas (Sput) - amarok-1.90.ebuild: - Add ~x86 keyword - -*amarok-1.90 (22 Aug 2008) - - 22 Aug 2008; Manuel Nickschas +metadata.xml, - +amarok-1.90.ebuild: - Initial import. - diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest deleted file mode 100644 index 5758d97f..00000000 --- a/media-sound/amarok/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX 2.0.1.1-ipod.patch 6713 RMD160 40a0da7ceca93e081edfa660383f8281dc4c2d68 SHA1 8a1aad8e9a8ad34fac3de7ca8ba5966c4dbfb50f SHA256 612cdb6886d0bac22773d7a621d3062d0eb96801cff8053d4011e44cb738fb61 -AUX amarok-2.0.2-librt-1.patch 721 RMD160 a36d3cb937674672d41c790559084e4cd8c7c730 SHA1 0ca0e33ec624937d1d55a35911d8a2e401cc4c09 SHA256 37801a5a80bb2272dcd0eb5aad6305eed41c9822f92e1876c159e805cd7565c5 -AUX amarok-ipod.patch 5230 RMD160 d147223985dc8c45d0aaaad5008a4b2024159051 SHA1 d94aa98a17229b2ddbae4128021bdb727fb38202 SHA256 b119ba280bba29276ece49b3d80d8770aee831e9afcb1d8795811130b734994a -AUX disable_bindings_test.patch 550 RMD160 3ff076dccf7036fcd52836ff529ae16b56fdcbd1 SHA1 09dadd86dc57c39ce768230bf8e0630af40db297 SHA256 b3a4cd44dbd8ce610cb6d5a9214df0abb1458290c6382458dfeb95de00f92ba6 -DIST amarok-2.0.2.tar.bz2 4979989 RMD160 d9e7aa2e97c9a80450993aceebbbe1a6f0c301f3 SHA1 13bb7c71b27e88cad728f63c624af90111daeb5c SHA256 d13c0b6b058a8dfd86194c81f89365f69adc14f0e4e6ac82359135629caaf651 -EBUILD amarok-2.0.2.ebuild 2971 RMD160 27e664ef53e1e790f66ccb29dbd59e1b60477c6b SHA1 502ad3bf53464d84c16565d5d18352fd1a811b49 SHA256 89e30e2a3a95d63b2f457eb04d9ef6ad9e7fb3ee4a301be824e175f7810d7a7a -EBUILD amarok-2.1.0_pre20090502.ebuild 2153 RMD160 1740e8d9ad7ec25afe2368c452202bb8fd751e3e SHA1 bb9099c21b314b608d66995d01ecd040a66ab322 SHA256 d2f7858c0093cc1e7e5917fc999a0bf440f5b1294ad95817dfcd544304da3a91 -MISC ChangeLog 3682 RMD160 f894bd5623f0ef92c48d0e5706fab5ab55c22380 SHA1 161900bba61264e2e73fcf1361da0650178f18a2 SHA256 3c2eb7beab3ba906d7888709407f2d96b019109eeae2cce15be0cc5a92a47672 -MISC metadata.xml 2242 RMD160 5c8dc1dad24c8ced0799cec417f365eb6f5b34f4 SHA1 d34e266daa2e6b1e9b90930003b7aafdd9354195 SHA256 b51d1bb69f0f14303609a332c31fcf88b1a54b8b317e275550a26803ba076cae diff --git a/media-sound/amarok/amarok-2.0.2.ebuild b/media-sound/amarok/amarok-2.0.2.ebuild deleted file mode 100644 index b90ef899..00000000 --- a/media-sound/amarok/amarok-2.0.2.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -KDE_LINGUAS="ar be bg ca cs csb da de el eo es et eu fi fr ga gl he is it ja km - ko ku lt lv nb nds ne nl nn oc pa pl pt pt_BR ro ru se sl si sk sv th tr uk zh_CN zh_TW" - -OPENGL_REQUIRED="optional" -inherit kde4-base - -DESCRIPTION="Advanced audio player based on KDE framework." -HOMEPAGE="http://amarok.kde.org/" -SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2" - -LICENSE="GPL-2" -KEYWORDS="~x86" -SLOT="2" -IUSE="cdaudio daap debug ifp ipod mp3tunes mp4 mtp njb +semantic-desktop" - -DEPEND=" - >=app-misc/strigi-0.5.7 - || ( - >=dev-db/mysql-5.0[embedded] - >=dev-db/mysql-community-5.0[embedded] - ) - dev-db/sqlite:3 - >=media-libs/taglib-1.5 - || ( - media-sound/phonon - x11-libs/qt-phonon:4 - ) - >=kde-base/kdelibs-${KDE_MINIMAL}[kdeprefix=,opengl?,semantic-desktop?] - >=kde-base/plasma-workspace-${KDE_MINIMAL}[kdeprefix=] - x11-libs/qt-webkit:4 - cdaudio? ( - >=kde-base/libkcompactdisc-${KDE_MINIMAL}[kdeprefix=] - >=kde-base/libkcddb-${KDE_MINIMAL}[kdeprefix=] - ) - ifp? ( media-libs/libifp ) - ipod? ( >=media-libs/libgpod-0.4.2 ) - mp3tunes? ( - dev-libs/libxml2 - dev-libs/openssl - net-libs/loudmouth - net-misc/curl - ) - mp4? ( media-libs/libmp4v2 ) - mtp? ( >=media-libs/libmtp-0.3.0 ) - njb? ( >=media-libs/libnjb-2.2.4 ) -" -RDEPEND="${DEPEND} - app-arch/unzip - daap? ( www-servers/mongrel ) - semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL}[kdeprefix=] ) -" - -PATCHES=( "${FILESDIR}/2.0.1.1-ipod.patch" - "${FILESDIR}/amarok-2.0.2-librt-1.patch" ) - -pkg_setup() { - if use amd64 ; then - echo - ewarn "Compilation will fail if dev-db/mysql[-community] is built without -fPIC in your CFLAGS!" - ewarn "Related bug: http://bugs.gentoo.org/show_bug.cgi?id=238487" - ewarn - ewarn "To fix this, and to avoid using -fPIC globally in your make.conf (which is not recommended)," - ewarn "put the following into /etc/portage/env/dev-db/mysql (or mysql-community, depending on which you use;" - ewarn "create dirs and the file if they don't exist):" - ewarn - ewarn "CFLAGS=\"${CFLAGS} -DPIC -fPIC\"" - ewarn "CXXFLAGS=\"${CXXFLAGS} -DPIC -fPIC\"" - echo - fi - - kde4-base_pkg_setup -} - -src_configure() { - if ! use mp3tunes; then - sed -e'/mp3tunes/ s:^:#DONOTWANT :' \ - -i "${S}"/src/services/CMakeLists.txt \ - || die "Deactivating mp3tunes failed." - fi - - # Remove superfluous QT_WEBKIT - sed -e 's/ -DQT_WEBKIT//g' \ - -i "${S}"/src/scriptengine/generator/generator/CMakeLists.txt \ - || die "Removing unnecessary -DQT_WEBKIT failed." - - mycmakeargs="${mycmakeargs} - -DUSE_SYSTEM_SQLITE=ON - $(cmake-utils_use_with cdaudio KdeMultimedia) - $(cmake-utils_use_with ipod Ipod) - $(cmake-utils_use_with ifp Ifp) - $(cmake-utils_use_with mp4 Mp4v2) - $(cmake-utils_use_with mtp Mtp) - $(cmake-utils_use_with njb Njb) - $(cmake-utils_use_with semantic-desktop Nepomuk) - $(cmake-utils_use_with semantic-desktop Soprano)" - - kde4-base_src_configure -} diff --git a/media-sound/amarok/amarok-2.1.0_pre20090502.ebuild b/media-sound/amarok/amarok-2.1.0_pre20090502.ebuild deleted file mode 100644 index 96380ebc..00000000 --- a/media-sound/amarok/amarok-2.1.0_pre20090502.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -OPENGL_REQUIRED="optional" -KMNAME="extragear/multimedia" -inherit kde4-base subversion -ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/trunk/extragear/multimedia/${PN}/@{${PV/2.1.0_pre/}}" - -DESCRIPTION="Advanced audio player based on KDE framework." -HOMEPAGE="http://amarok.kde.org/" - -LICENSE="GPL-2" -KEYWORDS="~x86 ~amd64" -SLOT="2" -IUSE="cdaudio daap debug gtk ipod mp3tunes mtp +semantic-desktop" - -DEPEND=" - >=app-misc/strigi-0.5.7 - || ( - >=dev-db/mysql-5.0.76-r1[embedded,-minimal] - >=dev-db/mysql-community-5.0.77-r1[embedded,-minimal] - ) - >=media-libs/taglib-1.5 - >=media-libs/taglib-extras-0.1[kde] - >=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?] - >=kde-base/phonon-kde-${KDE_MINIMAL} - >=kde-base/plasma-workspace-${KDE_MINIMAL} - sys-libs/zlib - >=x11-libs/qtscriptgenerator-0.1.0 - cdaudio? ( - >=kde-base/libkcddb-${KDE_MINIMAL} - >=kde-base/libkcompactdisc-${KDE_MINIMAL} - ) - ipod? ( - >=media-libs/libgpod-0.7.0 - gtk? ( x11-libs/gtk+:2 ) - ) - mp3tunes? ( - dev-libs/glib:2 - dev-libs/libxml2 - dev-libs/openssl - net-libs/loudmouth - net-misc/curl - x11-libs/qt-core[glib] - ) - mtp? ( >=media-libs/libmtp-0.3.0 ) -" -RDEPEND="${DEPEND} - media-sound/amarok-utils - semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL} ) -" - -src_prepare() { - kde4-base_src_prepare - - append-flags -I${KDEDIR} - append-ldflags -L${KDEDIR}/$(get_libdir) -Wl,--as-needed - epatch "${FILESDIR}/disable_bindings_test.patch" -} - -src_configure() { - mycmakeargs="${mycmakeargs} - -DWITH_PLAYER=ON - -DWITH_UTILITIES=OFF - -DWITH_Libgcrypt=OFF - $(cmake-utils_use_with ipod Ipod) - $(cmake-utils_use_with gtk Gdk) - $(cmake-utils_use_with mtp Mtp) - $(cmake-utils_use_with mp3tunes MP3TUNES)" -# $(cmake-utils_use_with semantic-desktop Nepomuk) -# $(cmake-utils_use_with semantic-desktop Soprano)" - - kde4-base_src_configure -} - -pkg_postinst() { - kde4-base_pkg_postinst - - if use daap; then - echo - elog "You have installed amarok with daap support." - elog "You may be insterested in installing www-servers/mongrel as well." - echo - fi -} diff --git a/media-sound/amarok/files/2.0.1.1-ipod.patch b/media-sound/amarok/files/2.0.1.1-ipod.patch deleted file mode 100644 index 2e4300ed..00000000 --- a/media-sound/amarok/files/2.0.1.1-ipod.patch +++ /dev/null @@ -1,175 +0,0 @@ -diff -urN amarok-2.0.1.1.old/cmake/modules/FindIpod.cmake amarok-2.0.1.1/cmake/modules/FindIpod.cmake ---- amarok-2.0.1.1.old/cmake/modules/FindIpod.cmake 2009-01-06 13:48:28.000000000 +0100 -+++ amarok-2.0.1.1/cmake/modules/FindIpod.cmake 2009-02-10 18:18:23.000000000 +0100 -@@ -2,45 +2,35 @@ - # Once done this will define - # - # IPOD_FOUND - system has libgpod --# IPOD_INCLUDE_DIR - the libgpod include directory -+# IPOD_INCLUDE_DIRS - the libgpod include directory - # IPOD_LIBRARIES - Link these to use libgpod --# IPOD_DEFINITIONS - Compiler switches required for using libgpod -+# IPOD_CFLAGS - Compiler switches required for using libgpod -+# IPOD_VERSION - Version number of libgpod - # - --if (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) -+if (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES) - - # in cache already - SET(IPOD_FOUND TRUE) - --else (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) -+else (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES) - if(NOT WIN32) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls -- INCLUDE(UsePkgConfig) -- -- PKGCONFIG(libgpod-1.0 _IPODIncDir _IPODLinkDir _IPODLinkFlags _IPODCflags) -- -- set(IPOD_DEFINITIONS ${_IPODCflags}) -+ find_package(PkgConfig) -+ PKG_SEARCH_MODULE(IPOD libgpod-1.0) -+ - endif(NOT WIN32) -+ IF (IPOD_FOUND) -+ IF (NOT IPOD_FIND_QUIETLY) -+ MESSAGE(STATUS "Found libgpod-1 ${IPOD_VERSION}") -+ ENDIF (NOT IPOD_FIND_QUIETLY) -+ ELSE (IPOD_FOUND) -+ IF (IPOD_FIND_REQUIRED) -+ MESSAGE(FATAL_ERROR "Could NOT find libgpod-1, check FindPkgConfig output above!") -+ ENDIF (IPOD_FIND_REQUIRED) -+ ENDIF (IPOD_FOUND) -+ -+ MARK_AS_ADVANCED(IPOD_INCLUDE_DIRS) - -- FIND_PATH(IPOD_INCLUDE_DIR gpod/itdb.h /usr/include/gpod-1.0 -- ${_IPODIncDir} -- ) -- -- FIND_LIBRARY(IPOD_LIBRARIES NAMES gpod -- PATHS -- ${_IPODLinkDir} -- ) -- -- if (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) -- SET(IPOD_FOUND TRUE) -- else (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) -- SET(IPOD_FOUND_FALSE) -- endif (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) -- -- include(FindPackageHandleStandardArgs) -- FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ipod DEFAULT_MSG IPOD_INCLUDE_DIR IPOD_LIBRARIES ) -- -- MARK_AS_ADVANCED(IPOD_INCLUDE_DIR IPOD_LIBRARIES) -- --endif (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) -+endif (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES) -diff -urN amarok-2.0.1.1.old/CMakeLists.txt amarok-2.0.1.1/CMakeLists.txt ---- amarok-2.0.1.1.old/CMakeLists.txt 2009-01-06 14:12:50.000000000 +0100 -+++ amarok-2.0.1.1/CMakeLists.txt 2009-02-10 18:22:23.000000000 +0100 -@@ -56,7 +56,10 @@ - macro_log_feature( GDK_FOUND "Gdk" "Support for artwork on iPod audio devices via GdkPixbuf" "http://developer.gnome.org/arch/imaging/gdkpixbuf.html" FALSE "2.0.x" "" ) - - macro_optional_find_package(Ipod) --macro_log_feature( IPOD_FOUND "libgpod" "Support Apple iPod audio devices" "http://sourceforge.net/projects/gtkpod/" FALSE "0.6.0" "" ) -+if(IPOD_FOUND) -+ macro_ensure_version("0.7.0" ${IPOD_VERSION} IPOD_0_7) -+endif(IPOD_FOUND) -+macro_log_feature( IPOD_FOUND "libgpod" "Support Apple iPod audio devices" "http://sourceforge.net/projects/gtkpod/" FALSE "0.7.0" "" ) - - #macro_optional_find_package(MySQL) - #macro_log_feature( MYSQL_FOUND "mysql" "Store Collection in a mysql database instead of a sqlite one" "http://www.mysql.com" FALSE "4.1.0" "" ) -diff -urN amarok-2.0.1.1.old/src/collection/ipodcollection/CMakeLists.txt amarok-2.0.1.1/src/collection/ipodcollection/CMakeLists.txt ---- amarok-2.0.1.1.old/src/collection/ipodcollection/CMakeLists.txt 2009-01-06 13:49:32.000000000 +0100 -+++ amarok-2.0.1.1/src/collection/ipodcollection/CMakeLists.txt 2009-02-10 22:22:01.000000000 +0100 -@@ -17,7 +17,7 @@ - handler - ${GLIB2_INCLUDE_DIR} - ${GDK_INCLUDE_DIR} -- ${IPOD_INCLUDE_DIR} -+ ${IPOD_INCLUDE_DIRS} - ${CMAKE_CURRENT_BINARY_DIR}/../.. - ${AMAROK_COLLECTION_SUPPORT_DIR} - ${KDE4_INCLUDE_DIR} -diff -urN amarok-2.0.1.1.old/src/collection/ipodcollection/handler/IpodHandler.cpp amarok-2.0.1.1/src/collection/ipodcollection/handler/IpodHandler.cpp ---- amarok-2.0.1.1.old/src/collection/ipodcollection/handler/IpodHandler.cpp 2009-01-06 13:49:32.000000000 +0100 -+++ amarok-2.0.1.1/src/collection/ipodcollection/handler/IpodHandler.cpp 2009-02-10 18:00:09.000000000 +0100 -@@ -1339,73 +1339,12 @@ - QFileInfo tempImageFileInfo( tempImageFile ); // get info for path - QString tempImagePath = tempImageFileInfo.absoluteFilePath(); // path - -- Itdb_Thumb *thumb = NULL; - GdkPixbuf *gpixbuf = NULL; -- QString thumbPath; - - // pull image out of ipod - -- if( ipodtrack->has_artwork == 0x01 ) -- { -- // try small first -- -- thumb = itdb_artwork_get_thumb_by_type ( ipodtrack->artwork, ITDB_THUMB_COVER_SMALL ); -- -- // then large if needed -- if( thumb == NULL) -- { -- thumb = itdb_artwork_get_thumb_by_type ( ipodtrack->artwork, ITDB_THUMB_COVER_LARGE ); -- } -- -- if( thumb != NULL) -- { -- gpixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( m_device, thumb ); -- } -- else -- { -- GList *thumbs = ipodtrack->artwork->thumbnails; -- -- for(; thumbs; thumbs = thumbs->next) -- { -- Itdb_Thumb *curThumb = ( Itdb_Thumb * )thumbs->data; -- if( curThumb == NULL) -- continue; -- -- switch( curThumb->type ) -- { -- case ITDB_THUMB_PHOTO_SMALL: -- break; -- case ITDB_THUMB_PHOTO_LARGE: -- break; -- case ITDB_THUMB_PHOTO_FULL_SCREEN: -- break; -- case ITDB_THUMB_PHOTO_TV_SCREEN: -- break; -- case ITDB_THUMB_COVER_XLARGE: -- break; -- case ITDB_THUMB_COVER_MEDIUM: -- break; -- case ITDB_THUMB_COVER_SMEDIUM: -- break; -- case ITDB_THUMB_COVER_XSMALL: -- break; -- -- default: -- break; -- } -- -- thumb = curThumb; -- break; -- -- } -- -- if( thumb != NULL) -- { -- thumbPath = QString::fromUtf8( itdb_thumb_get_filename( m_device, thumb ) ); -- gpixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( m_device, thumb ); -- } -- } -- } -+ if( ipodtrack->has_artwork == 0x01 ) // 0x01 = true ; 0x02 = false -+ gpixbuf = (GdkPixbuf*) itdb_artwork_get_pixbuf( m_device, ipodtrack->artwork, 50, 50 ); - - if(gpixbuf != NULL) - { diff --git a/media-sound/amarok/files/amarok-2.0.2-librt-1.patch b/media-sound/amarok/files/amarok-2.0.2-librt-1.patch deleted file mode 100644 index b218db11..00000000 --- a/media-sound/amarok/files/amarok-2.0.2-librt-1.patch +++ /dev/null @@ -1,18 +0,0 @@ -Submitted By: Mario Fetka (mario dot fetka at gmail dot com) -Date: 2009-03-08 -Initial Package Version: 2.0.2 -Origin: me -Upstream Status: unknown -Description: also link to lib rt for mysql embedded - -diff -Naur amarok-2.0.2.orig/src/collection/sqlcollection/CMakeLists.txt amarok-2.0.2/src/collection/sqlcollection/CMakeLists.txt ---- amarok-2.0.2.orig/src/collection/sqlcollection/CMakeLists.txt 2009-03-08 11:55:17.804059862 +0000 -+++ amarok-2.0.2/src/collection/sqlcollection/CMakeLists.txt 2009-03-08 11:56:04.183102651 +0000 -@@ -58,6 +58,7 @@ - target_link_libraries(amarok_collection-sqlcollection - amaroklib - amarokpud -+ rt - ${KDE4_KDEUI_LIBS} - ${KDE4_KIO_LIBS} - ${KDE4_THREADWEAVER_LIBRARIES} diff --git a/media-sound/amarok/files/amarok-ipod.patch b/media-sound/amarok/files/amarok-ipod.patch deleted file mode 100644 index d4621d1d..00000000 --- a/media-sound/amarok/files/amarok-ipod.patch +++ /dev/null @@ -1,159 +0,0 @@ ---- cmake/modules/FindIpod.cmake 2009-01-06 13:48:28.000000000 +0100 -+++ cmake/modules/FindIpod.cmake 2009-02-10 18:18:23.000000000 +0100 -@@ -2,45 +2,35 @@ - # Once done this will define - # - # IPOD_FOUND - system has libgpod --# IPOD_INCLUDE_DIR - the libgpod include directory -+# IPOD_INCLUDE_DIRS - the libgpod include directory - # IPOD_LIBRARIES - Link these to use libgpod --# IPOD_DEFINITIONS - Compiler switches required for using libgpod -+# IPOD_CFLAGS - Compiler switches required for using libgpod -+# IPOD_VERSION - Version number of libgpod - # - --if (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) -+if (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES) - - # in cache already - SET(IPOD_FOUND TRUE) - --else (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) -+else (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES) - if(NOT WIN32) - # use pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls -- INCLUDE(UsePkgConfig) -- -- PKGCONFIG(libgpod-1.0 _IPODIncDir _IPODLinkDir _IPODLinkFlags _IPODCflags) -- -- set(IPOD_DEFINITIONS ${_IPODCflags}) -+ find_package(PkgConfig) -+ PKG_SEARCH_MODULE(IPOD libgpod-1.0) -+ - endif(NOT WIN32) -+ IF (IPOD_FOUND) -+ IF (NOT IPOD_FIND_QUIETLY) -+ MESSAGE(STATUS "Found libgpod-1 ${IPOD_VERSION}") -+ ENDIF (NOT IPOD_FIND_QUIETLY) -+ ELSE (IPOD_FOUND) -+ IF (IPOD_FIND_REQUIRED) -+ MESSAGE(FATAL_ERROR "Could NOT find libgpod-1, check FindPkgConfig output above!") -+ ENDIF (IPOD_FIND_REQUIRED) -+ ENDIF (IPOD_FOUND) -+ -+ MARK_AS_ADVANCED(IPOD_INCLUDE_DIRS) - -- FIND_PATH(IPOD_INCLUDE_DIR gpod/itdb.h /usr/include/gpod-1.0 -- ${_IPODIncDir} -- ) -- -- FIND_LIBRARY(IPOD_LIBRARIES NAMES gpod -- PATHS -- ${_IPODLinkDir} -- ) -- -- if (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) -- SET(IPOD_FOUND TRUE) -- else (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) -- SET(IPOD_FOUND_FALSE) -- endif (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) -- -- include(FindPackageHandleStandardArgs) -- FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ipod DEFAULT_MSG IPOD_INCLUDE_DIR IPOD_LIBRARIES ) -- -- MARK_AS_ADVANCED(IPOD_INCLUDE_DIR IPOD_LIBRARIES) -- --endif (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) -+endif (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES) - ---- src/collection/ipodcollection/CMakeLists.txt 2009-01-06 13:49:32.000000000 +0100 -+++ src/collection/ipodcollection/CMakeLists.txt 2009-02-10 22:22:01.000000000 +0100 -@@ -17,7 +17,7 @@ - handler - ${GLIB2_INCLUDE_DIR} - ${GDK_INCLUDE_DIR} -- ${IPOD_INCLUDE_DIR} -+ ${IPOD_INCLUDE_DIRS} - ${CMAKE_CURRENT_BINARY_DIR}/../.. - ${AMAROK_COLLECTION_SUPPORT_DIR} - ${KDE4_INCLUDE_DIR} - ---- src/collection/ipodcollection/handler/IpodHandler.cpp 2009-01-06 13:49:32.000000000 +0100 -+++ src/collection/ipodcollection/handler/IpodHandler.cpp 2009-02-10 18:00:09.000000000 +0100 -@@ -1339,73 +1339,12 @@ - QFileInfo tempImageFileInfo( tempImageFile ); // get info for path - QString tempImagePath = tempImageFileInfo.absoluteFilePath(); // path - -- Itdb_Thumb *thumb = NULL; - GdkPixbuf *gpixbuf = NULL; -- QString thumbPath; - - // pull image out of ipod - -- if( ipodtrack->has_artwork == 0x01 ) -- { -- // try small first -- -- thumb = itdb_artwork_get_thumb_by_type ( ipodtrack->artwork, ITDB_THUMB_COVER_SMALL ); -- -- // then large if needed -- if( thumb == NULL) -- { -- thumb = itdb_artwork_get_thumb_by_type ( ipodtrack->artwork, ITDB_THUMB_COVER_LARGE ); -- } -- -- if( thumb != NULL) -- { -- gpixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( m_device, thumb ); -- } -- else -- { -- GList *thumbs = ipodtrack->artwork->thumbnails; -- -- for(; thumbs; thumbs = thumbs->next) -- { -- Itdb_Thumb *curThumb = ( Itdb_Thumb * )thumbs->data; -- if( curThumb == NULL) -- continue; -- -- switch( curThumb->type ) -- { -- case ITDB_THUMB_PHOTO_SMALL: -- break; -- case ITDB_THUMB_PHOTO_LARGE: -- break; -- case ITDB_THUMB_PHOTO_FULL_SCREEN: -- break; -- case ITDB_THUMB_PHOTO_TV_SCREEN: -- break; -- case ITDB_THUMB_COVER_XLARGE: -- break; -- case ITDB_THUMB_COVER_MEDIUM: -- break; -- case ITDB_THUMB_COVER_SMEDIUM: -- break; -- case ITDB_THUMB_COVER_XSMALL: -- break; -- -- default: -- break; -- } -- -- thumb = curThumb; -- break; -- -- } -- -- if( thumb != NULL) -- { -- thumbPath = QString::fromUtf8( itdb_thumb_get_filename( m_device, thumb ) ); -- gpixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( m_device, thumb ); -- } -- } -- } -+ if( ipodtrack->has_artwork == 0x01 ) // 0x01 = true ; 0x02 = false -+ gpixbuf = (GdkPixbuf*) itdb_artwork_get_pixbuf( m_device, ipodtrack->artwork, 50, 50 ); - - if(gpixbuf != NULL) - { diff --git a/media-sound/amarok/files/disable_bindings_test.patch b/media-sound/amarok/files/disable_bindings_test.patch deleted file mode 100644 index 27194a88..00000000 --- a/media-sound/amarok/files/disable_bindings_test.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- CMakeLists.txt 2009-03-24 16:51:54.000000000 +0200 -+++ CMakeLists.txt2 2009-03-24 17:06:57.000000000 +0200 -@@ -38,9 +38,6 @@ - - macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE "4.2.0" "" ) - -- find_package( QtScriptQtBindings REQUIRED ) -- macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" TRUE "" "" ) -- - add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) - - find_package(MySQLAmarok REQUIRED) diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml deleted file mode 100644 index eb567bb5..00000000 --- a/media-sound/amarok/metadata.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - -kde - - - Enable cdaudio functionality - - Enable the scripts for music sharing through DAAP. This flag adds - dependencies on www-servers/mongrel to allow sharing of - the Amarok music collection through DAAP protocol. Please note - that turning this flag off has no effect on DAAP browsing. - - Enable support for iRiver devices access through libifp - Enable mp3tunes integration - - Build the TagLib plugin for writing tags in Mp4 container files - (m4a). Please note that by enabling this USE flag, the resulting - package will not be redistributable, as it links to - media-libs/libmp4v2, distributed under a - GPL-incompatible license. - - Enable support for libMTP (Plays4Sure) devices access through libmtp - Enable support for NJB (Creative) devices access through libnjb - - - Semantic desktop allows for storage of digital informationand its - metadata to allow the user to express his personal mental models, making - all information become intuitively accessible - - - -