diff options
| -rw-r--r-- | media-sound/amarok-utils/Manifest | 16 | ||||
| -rw-r--r-- | media-sound/amarok/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/amarok/Manifest | 13 | ||||
| -rw-r--r-- | media-sound/amarok/amarok-2.1.1.ebuild | 87 | ||||
| -rw-r--r-- | media-sound/amarok/amarok-2.1.ebuild | 87 | ||||
| -rw-r--r-- | media-sound/amarok/files/disable_bindings_test.patch | 12 |
6 files changed, 20 insertions, 201 deletions
diff --git a/media-sound/amarok-utils/Manifest b/media-sound/amarok-utils/Manifest index b502d42603d3..5167a9009239 100644 --- a/media-sound/amarok-utils/Manifest +++ b/media-sound/amarok-utils/Manifest @@ -1,10 +1,16 @@ -DIST amarok-2.1.1.tar.bz2 5151731 RMD160 7a2a00fde109cc6c76b07922bd6a9d583b162782 SHA1 6242afaec5112ea3933885cb6948b19c0209b3c4 SHA256 27d6627e965e37da7a68b23a2807cabb54fe3c6febaa081ae200388396cd117c -DIST amarok-2.1.tar.bz2 4782899 RMD160 0c756b5e0e88c7efa96541c67388fd37aae788f7 SHA1 ce6635e4e388de4ebf3ffe9971826c2c9da95acf SHA256 19ac076d475babdeb66d1d1f5c8a2eea91aba0fe4f6d1478636af361b66fb8ea +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + DIST amarok-2.2.0.tar.bz2 8379041 RMD160 bf86bae9dd1039f4c7e591fc0104a819ecd57fca SHA1 7603f991aa92810669e71278f9abc20a2180f97d SHA256 2f40b0664701f79d5a49cb336ba2567535e0eb093c1a0691bbac08b73224643d DIST amarok-2.2.1.tar.bz2 8701156 RMD160 75d4fe3c71059c0f562763c0145981dad4be7158 SHA1 438cb6e59ed1f1bc310af8608dabb9ba5d46f031 SHA256 f3dbb257d64cd0787701df90fabc09f908294063657571f7f856780addcc1a08 -EBUILD amarok-utils-2.1.1.ebuild 1284 RMD160 ce21c9ce8bb54541c8e11ed364ea91e1132e7be2 SHA1 bbd37ae73b16ea18401b45dded5e82529420ec41 SHA256 f23a9001a12b5f528ca147f0b402182fe3b26c8be956b7731b5507dd7ac8f9db -EBUILD amarok-utils-2.1.ebuild 1282 RMD160 377b09c117e471844968fc8934fe49f75309261a SHA1 f96a471dbdda49d41cb0d1380eb057db26f8e55a SHA256 c81bb63ea5cef6d254d00be8c17e59af0ebacfafcd1571f1965d8d7d401f1472 EBUILD amarok-utils-2.2.0.ebuild 1463 RMD160 a207359e7227fda5169f818c3e15ac37123ddfdb SHA1 5f8a06d70ca98d235dd4710d08944d4dc3afbe4d SHA256 ab6bfc26e25c33a8aa0c69ed732ab997783830f9aae5b71b5a10b271abb06443 EBUILD amarok-utils-2.2.1.ebuild 1480 RMD160 1c8850d021993bc6ad2f6f1d592eb7280cda634a SHA1 f293aaa95b4648bd99ae7e748be5d659be26c171 SHA256 07ee5aaade1b4ac19ad7906eb379dfdf5ee2e9c9e1e10701f3006348c231a04d -MISC ChangeLog 1449 RMD160 db68a6361dfd47664d4d5bbfdef118b697c5d920 SHA1 640e9af002ac32a4550dcebbb24ecd676acdf933 SHA256 c7eb686447f1bf9d1f53a7b801d107f5823d8a5ed1e989ac3c590a75390bb875 +MISC ChangeLog 1585 RMD160 c142f9f82672b411ac10a3d0f24a0d7f5edd9291 SHA1 97f6304830a2f22e677d752cb47f0a2c81c51d0d SHA256 4594c7af3c587dd7331a12874996aaa69fb297377eaf56b9a37af003ff4992df MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.13 (GNU/Linux) + +iEYEARECAAYFAkr/S9AACgkQjDdoMVfcAHisPwCeLaaGf0YfJ6Xadbajw9Czlyuv +VzwAn1fp6fIVtiZ52FIq0ayVB8JVhTi5 +=nqH3 +-----END PGP SIGNATURE----- diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog index 4719a2c67d43..848dba628a2f 100644 --- a/media-sound/amarok/ChangeLog +++ b/media-sound/amarok/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/amarok # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.346 2009/11/14 15:20:30 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.347 2009/11/15 00:27:26 tampakrap Exp $ + + 15 Nov 2009; Theo Chatzimichos <tampakrap@gentoo.org> -amarok-2.1.ebuild, + -amarok-2.1.1.ebuild, -files/disable_bindings_test.patch: + Remove old 2.1 ebuilds and deprecated patch 14 Nov 2009; Theo Chatzimichos <tampakrap@gentoo.org> amarok-2.2.0.ebuild, amarok-2.2.1.ebuild, +files/amarok-qtscriptcheck.patch: diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest index d0c0cdcf0516..8f71cf17b2c5 100644 --- a/media-sound/amarok/Manifest +++ b/media-sound/amarok/Manifest @@ -7,24 +7,19 @@ AUX amarok-1.4.9.1-libmtp-0.3.0-API.patch 1912 RMD160 475852fde4ad1e27cc093d9435 AUX amarok-libmp4v2-2.patch 1317 RMD160 f2af142c7acca5d2f558d121fa4cd0ded2ea044c SHA1 14ab94f14e5be19f7ea5c6b83fdde768a1e5bcc1 SHA256 9a83dfdab7f393a802ec6394bf314736c7866391fb496b256c028bc81f86ce5c AUX amarok-libmp4v2.patch 2882 RMD160 f0786378bf963e8d10db49631bb0981facd9ed90 SHA1 a60289d7c852056c27ad2d03dc09b0500f428ac3 SHA256 df4c71a25381470411ac2223ec978989e1f3fa7e784de6a0b9e1cb53eed65e06 AUX amarok-qtscriptcheck.patch 1024 RMD160 0693ddd6bbaa2f15d381eec329cfeff1e8b176cd SHA1 0585c08f8159a06c95e89f22e788d6e039224fbb SHA256 8a2983f3bd5ec422f2ed0a90a49970fd13fed3852c66ed220c01b4d8418ce89d -AUX disable_bindings_test.patch 550 RMD160 3ff076dccf7036fcd52836ff529ae16b56fdcbd1 SHA1 09dadd86dc57c39ce768230bf8e0630af40db297 SHA256 b3a4cd44dbd8ce610cb6d5a9214df0abb1458290c6382458dfeb95de00f92ba6 DIST amarok-1.4.10-post20090130.diff.tar.bz2 4050 RMD160 e1b871213d7658081ffd396a1a208f97c3f10752 SHA1 8aa7492e91529ce1e01f3d2ee8183b7d7da7cb83 SHA256 64924546008abf88f7f776b27afe3de539defcd212c79c62c6abd90a7174dbe0 DIST amarok-1.4.10.tar.bz2 12812583 RMD160 f86c71dd0459e0cf1ff586cd6de240ca6501cf62 SHA1 cb0bebe99c6f4dc1b01601f2f3aee3a86da08fbd SHA256 4b28f86e81447b94d33c35aa0cff65d59d85da74fde2a86c5c7862c048509c9b -DIST amarok-2.1.1.tar.bz2 5151731 RMD160 7a2a00fde109cc6c76b07922bd6a9d583b162782 SHA1 6242afaec5112ea3933885cb6948b19c0209b3c4 SHA256 27d6627e965e37da7a68b23a2807cabb54fe3c6febaa081ae200388396cd117c -DIST amarok-2.1.tar.bz2 4782899 RMD160 0c756b5e0e88c7efa96541c67388fd37aae788f7 SHA1 ce6635e4e388de4ebf3ffe9971826c2c9da95acf SHA256 19ac076d475babdeb66d1d1f5c8a2eea91aba0fe4f6d1478636af361b66fb8ea DIST amarok-2.2.0.tar.bz2 8379041 RMD160 bf86bae9dd1039f4c7e591fc0104a819ecd57fca SHA1 7603f991aa92810669e71278f9abc20a2180f97d SHA256 2f40b0664701f79d5a49cb336ba2567535e0eb093c1a0691bbac08b73224643d DIST amarok-2.2.1.tar.bz2 8701156 RMD160 75d4fe3c71059c0f562763c0145981dad4be7158 SHA1 438cb6e59ed1f1bc310af8608dabb9ba5d46f031 SHA256 f3dbb257d64cd0787701df90fabc09f908294063657571f7f856780addcc1a08 EBUILD amarok-1.4.10_p20090130-r3.ebuild 3198 RMD160 c88ab563457a4dc8c226d41a32dc8b0c9a8b7418 SHA1 f98f41ac480a9c8c0d99c939fc2de1aa514a4f6b SHA256 17a78dbb7d26439930a18b9148144d3862dce12bf3201d2872fde27ac75dd66f -EBUILD amarok-2.1.1.ebuild 2393 RMD160 84f67da3d49ce3441eeb6721a8f2116ec6c98ab5 SHA1 475cf04b1e73ffd1cc1f2b4f40704e2a671e2fb6 SHA256 089d8d2565e96f102416de5c75852067da3a14bd886b6f59f6675fcf62e1cf08 -EBUILD amarok-2.1.ebuild 2391 RMD160 ac645af2b8dc7c7c96286f001159c78f5a53fa59 SHA1 c9fe7fb8589397e7c0f4b17bc9a14d5bde56c01e SHA256 2781df1df211f85489677a59c93784a01c6f246ae3557b89cf3c69279ea48249 EBUILD amarok-2.2.0.ebuild 2760 RMD160 671c5f9228f9ae600aabe6c6448bf9fa7bdfd757 SHA1 02d340458f12dd79d7bcdd9717946a9c9b17fac2 SHA256 3a2ca481c3433417599b92940280d5516c3296a4212f3a5198abb4917062c8a9 EBUILD amarok-2.2.1.ebuild 2773 RMD160 6a07a36b2459b8506e4cc313c77f01ddee1b0e86 SHA1 e10b48f50e61e708c12e02b30b2207af71518be1 SHA256 b108945fd5933b0c251e02ae0d9c26cf4afc82c8c87831eb637e3e86bac5fafd -MISC ChangeLog 56099 RMD160 06561353dbaf25da98593ba1e465720871a1d526 SHA1 9532c6e00ee2cd28b8a04a152387b54e6c96d94f SHA256 d84e0bae35c22e22b132b9cc0c5d0d691f5a72906dbc9e50633488ed68ed8502 +MISC ChangeLog 56282 RMD160 679b192b2f6f4586aec80dd722cd7b8748ead451 SHA1 b52c99d4836a4c8c1fcc05a045078d2d9f05ac4f SHA256 d7cf66dadf8527b5f96e00cf3d9f5efb323782b2a846bff7489b3f813d1f5bda MISC metadata.xml 2160 RMD160 60852f091cb201337c8322cad498466cd63fee1d SHA1 15af0f24c3490806e06700d05bf5341779b2b26b SHA256 49e722b9b2a370e01b0efc327486bc3e02446e0c2b4b8047dffad765a1992357 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.13 (GNU/Linux) -iEYEARECAAYFAkr+yscACgkQjDdoMVfcAHigAwCgyK3VOGyKqa4OkIM62UMKdaAQ -SrsAoIs32ljLBUdGdtMPI5xsgBkad0mV -=YVB5 +iEYEARECAAYFAkr/Sr4ACgkQjDdoMVfcAHgjzwCcDToL15SqZ3ghvmQUDieRpHY7 +E/cAniJNakJYZS5C/rZdljq0gaIdqalN +=Lipf -----END PGP SIGNATURE----- diff --git a/media-sound/amarok/amarok-2.1.1.ebuild b/media-sound/amarok/amarok-2.1.1.ebuild deleted file mode 100644 index f29c731c75fa..000000000000 --- a/media-sound/amarok/amarok-2.1.1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.1.1.ebuild,v 1.2 2009/07/22 16:11:11 ssuominen Exp $ - -EAPI="2" - -KDE_LINGUAS="bg ca cs da de el en_GB es et eu fr gl he is it ja km ku lt lv nb -nds nl nn pa pl pt pt_BR ro ru sl sv th tr uk wa zh_CN zh_TW" -OPENGL_REQUIRED="optional" -KMNAME="extragear/multimedia" -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="~amd64 ~x86" -SLOT="4" -IUSE="cdda daap debug ipod mp3tunes mtp +semantic-desktop" - -# ipod requires gdk enabled and also gtk compiled in libgpod -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?] - sys-libs/zlib - >=x11-libs/qtscriptgenerator-0.1.0 - cdda? ( - >=kde-base/libkcddb-${KDE_MINIMAL} - >=kde-base/libkcompactdisc-${KDE_MINIMAL} - ) - ipod? ( - >=media-libs/libgpod-0.7.0[gtk] - ) - 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} - >=kde-base/phonon-kde-${KDE_MINIMAL} - >=media-sound/amarok-utils-${PV} - semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL} ) -" - -PATCHES=( "${FILESDIR}/disable_bindings_test.patch" ) - -src_configure() { - # Workaround for problems related to libmysqld.so and collection plugin not - # being found on some architectures when --as-needed is not used. - append-ldflags -Wl,--as-needed - - mycmakeargs="${mycmakeargs} - -DWITH_PLAYER=ON - -DWITH_UTILITIES=OFF - -DWITH_Libgcrypt=OFF - $(cmake-utils_use_with ipod Ipod) - $(cmake-utils_use_with ipod 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 interested in installing www-servers/mongrel as well." - echo - fi -} diff --git a/media-sound/amarok/amarok-2.1.ebuild b/media-sound/amarok/amarok-2.1.ebuild deleted file mode 100644 index fdd0534fbac0..000000000000 --- a/media-sound/amarok/amarok-2.1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.1.ebuild,v 1.3 2009/07/22 16:11:11 ssuominen Exp $ - -EAPI="2" - -KDE_LINGUAS="bg ca cs da de el en_GB es et eu fr gl he is it ja km ku lt lv nb -nds nl nn pa pl pt pt_BR ro ru sl sv th tr uk wa zh_CN zh_TW" -OPENGL_REQUIRED="optional" -KMNAME="extragear/multimedia" -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="~amd64 ~x86" -SLOT="4" -IUSE="cdda daap debug ipod mp3tunes mtp +semantic-desktop" - -# ipod requires gdk enabled and also gtk compiled in libgpod -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?] - sys-libs/zlib - >=x11-libs/qtscriptgenerator-0.1.0 - cdda? ( - >=kde-base/libkcddb-${KDE_MINIMAL} - >=kde-base/libkcompactdisc-${KDE_MINIMAL} - ) - ipod? ( - >=media-libs/libgpod-0.7.0[gtk] - ) - 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} - >=kde-base/phonon-kde-${KDE_MINIMAL} - >=media-sound/amarok-utils-${PV} - semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL} ) -" - -PATCHES=( "${FILESDIR}/disable_bindings_test.patch" ) - -src_configure() { - # Workaround for problems related to libmysqld.so and collection plugin not - # being found on some architectures when --as-needed is not used. - append-ldflags -Wl,--as-needed - - mycmakeargs="${mycmakeargs} - -DWITH_PLAYER=ON - -DWITH_UTILITIES=OFF - -DWITH_Libgcrypt=OFF - $(cmake-utils_use_with ipod Ipod) - $(cmake-utils_use_with ipod 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 interested in installing www-servers/mongrel as well." - echo - fi -} 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 27194a883959..000000000000 --- 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) |