From 5602a7243418a79fc1f97636816a4f7136e69441 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Sun, 28 Jan 2007 14:52:30 +0000 Subject: [PATCH] Remove old version; revision bump fo both 1.4.4 release and live Subversion ebuild to depend on mongrel rather than building and installing its own copy. This drops ~ppc ~ppc64 and ~sparc keywords. Package-Manager: portage-2.1.2-r4 --- media-sound/amarok/ChangeLog | 12 ++++- media-sound/amarok/Manifest | 51 +++++++++--------- media-sound/amarok/amarok-1.4.4-r3.ebuild | 5 +- ...1.4.3-r1.ebuild => amarok-1.4.4-r4.ebuild} | 54 ++++++++++++------- ...arok-9999.ebuild => amarok-9999-r1.ebuild} | 17 +++++- .../amarok/files/digest-amarok-1.4.3-r1 | 3 -- .../amarok/files/digest-amarok-1.4.4-r4 | 6 +++ ...gest-amarok-9999 => digest-amarok-9999-r1} | 0 8 files changed, 96 insertions(+), 52 deletions(-) rename media-sound/amarok/{amarok-1.4.3-r1.ebuild => amarok-1.4.4-r4.ebuild} (52%) rename media-sound/amarok/{amarok-9999.ebuild => amarok-9999-r1.ebuild} (81%) delete mode 100644 media-sound/amarok/files/digest-amarok-1.4.3-r1 create mode 100644 media-sound/amarok/files/digest-amarok-1.4.4-r4 rename media-sound/amarok/files/{digest-amarok-9999 => digest-amarok-9999-r1} (100%) diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog index d893f43e7ee5..786075c02da1 100644 --- a/media-sound/amarok/ChangeLog +++ b/media-sound/amarok/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for media-sound/amarok # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.195 2007/01/25 19:02:24 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.196 2007/01/28 14:52:30 flameeyes Exp $ + +*amarok-9999-r1 (28 Jan 2007) +*amarok-1.4.4-r4 (28 Jan 2007) + + 28 Jan 2007; Diego Pettenò + -amarok-1.4.3-r1.ebuild, amarok-1.4.4-r3.ebuild, +amarok-1.4.4-r4.ebuild, + -amarok-9999.ebuild, +amarok-9999-r1.ebuild: + Remove old version; revision bump fo both 1.4.4 release and live Subversion + ebuild to depend on mongrel rather than building and installing its own + copy. This drops ~ppc ~ppc64 and ~sparc keywords. 25 Jan 2007; Diego Pettenò amarok-9999.ebuild: Replace -* keyword with empty keywords. diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest index de29dadc0534..2bcab9fd6381 100644 --- a/media-sound/amarok/Manifest +++ b/media-sound/amarok/Manifest @@ -9,42 +9,41 @@ AUX amarok-1.4.4+libgpod-0.4.0.patch 2738 RMD160 2e6a44eabe8691c209a3beba5764fa9 MD5 2b0195629a6a2b52f22db726bc59cd2f files/amarok-1.4.4+libgpod-0.4.0.patch 2738 RMD160 2e6a44eabe8691c209a3beba5764fa9ca59aa43c files/amarok-1.4.4+libgpod-0.4.0.patch 2738 SHA256 8def3879b8adb5e2e32d4b4f724d4dd2d896791f6cbe99d5fffcb3f128b26b26 files/amarok-1.4.4+libgpod-0.4.0.patch 2738 -DIST amarok-1.4.3.tar.bz2 17175603 RMD160 287d6652868f50023d8602941fdc99aed5296d22 SHA1 624b5f9fd74ead1c0e75f7d8f935abcaf0313e70 SHA256 e9f6d8728d1c49467a2b72232c7ce907621e8e3792aa7dd9f206985b1450a847 DIST amarok-1.4.4-gentoo.tar.bz2 2830 RMD160 75c42ba3bab6aa363aa71bfd17d9532555abc040 SHA1 0a9bb86e197f4af47e17a4aaa5cb82eb4850b49d SHA256 d874db4cd1b63084df4c20b26ef461e95c242579c4d6e4ca80ccff046d149b33 DIST amarok-1.4.4.tar.bz2 17635707 RMD160 61cd2748ce0111f4ba388a71e9504abb7362b0d7 SHA1 932ab971407172a86746e473a1d1cf6871aea93c SHA256 760d30337cb73c86b9298e5c2c9836b3a753c39805b54f75b1eea82c15e9a0ea -EBUILD amarok-1.4.3-r1.ebuild 2101 RMD160 1f5f9a3f6196cada0c991cf49bfaef4f2e1d4730 SHA1 2e00ef3c4cb616f6452c74bb2d9c281033520d18 SHA256 1fa7844ed89fcb170d9477031eed546c34e0b9a762a21aca41d42f7eb1d2a035 -MD5 92afad9b9a442e3e05ed835f67ee5517 amarok-1.4.3-r1.ebuild 2101 -RMD160 1f5f9a3f6196cada0c991cf49bfaef4f2e1d4730 amarok-1.4.3-r1.ebuild 2101 -SHA256 1fa7844ed89fcb170d9477031eed546c34e0b9a762a21aca41d42f7eb1d2a035 amarok-1.4.3-r1.ebuild 2101 -EBUILD amarok-1.4.4-r3.ebuild 2197 RMD160 1ecb81b7dce90ece25802ec896e57b4d32eea3e0 SHA1 ff78ad31000c4cf6d99903f75a60d0c0cff5b4b8 SHA256 966edae29cbecc1bdf9bdc70789907f311b74dae9bc4a289ab097721ea13e03b -MD5 7a4a15bc57f2762987f3773ed3746329 amarok-1.4.4-r3.ebuild 2197 -RMD160 1ecb81b7dce90ece25802ec896e57b4d32eea3e0 amarok-1.4.4-r3.ebuild 2197 -SHA256 966edae29cbecc1bdf9bdc70789907f311b74dae9bc4a289ab097721ea13e03b amarok-1.4.4-r3.ebuild 2197 -EBUILD amarok-9999.ebuild 2261 RMD160 67f9e76ef0cdd0deeae77b4d4cd0c0362bfda290 SHA1 629b97515e08b81b527b92239d0b3db9b18cdce2 SHA256 70668fe401bbf0982cd2552519d68652685509c80a4b3ee031f793b53c90d4b6 -MD5 9c4e32128d48cdcb139916b946696c28 amarok-9999.ebuild 2261 -RMD160 67f9e76ef0cdd0deeae77b4d4cd0c0362bfda290 amarok-9999.ebuild 2261 -SHA256 70668fe401bbf0982cd2552519d68652685509c80a4b3ee031f793b53c90d4b6 amarok-9999.ebuild 2261 -MISC ChangeLog 32246 RMD160 e720281cfecdf126b6b85db909629a5f5daebd6c SHA1 6fcd2971fd9af9bc5ff150c34a448e16ddbd8048 SHA256 7bc8455b4bed2f189434790bf9771c1a1828ee39d27b81a41e0df5c8a391ea10 -MD5 018be5cd8c2296564669eb5376248fc5 ChangeLog 32246 -RMD160 e720281cfecdf126b6b85db909629a5f5daebd6c ChangeLog 32246 -SHA256 7bc8455b4bed2f189434790bf9771c1a1828ee39d27b81a41e0df5c8a391ea10 ChangeLog 32246 +EBUILD amarok-1.4.4-r3.ebuild 2243 RMD160 6b3856d91f5fa823761ef330472a138d62453c65 SHA1 9575ca2fd34d6a62ba6ee4d3bb5bc48f8ea6f2ac SHA256 8572bda6a3a8221652b2c4bb88499a8d04ef5d37a870c94953351a78ef0be0c3 +MD5 88d6fae4f34648898b448df3b67108e9 amarok-1.4.4-r3.ebuild 2243 +RMD160 6b3856d91f5fa823761ef330472a138d62453c65 amarok-1.4.4-r3.ebuild 2243 +SHA256 8572bda6a3a8221652b2c4bb88499a8d04ef5d37a870c94953351a78ef0be0c3 amarok-1.4.4-r3.ebuild 2243 +EBUILD amarok-1.4.4-r4.ebuild 2626 RMD160 fa7e98483f43a111d9532df51e94b95a3000088a SHA1 1e205cedf9f00414cf8673f059e979bf51aab319 SHA256 f7ae2f639aba01d33f8915257631f840e7494481b1cafed7ae38544d896116ba +MD5 bbaa2757ef01ceccaec04cc966b42be2 amarok-1.4.4-r4.ebuild 2626 +RMD160 fa7e98483f43a111d9532df51e94b95a3000088a amarok-1.4.4-r4.ebuild 2626 +SHA256 f7ae2f639aba01d33f8915257631f840e7494481b1cafed7ae38544d896116ba amarok-1.4.4-r4.ebuild 2626 +EBUILD amarok-9999-r1.ebuild 2705 RMD160 8795534ecb6875ee04562fdb3ac548fa5a9ad774 SHA1 815d67ad7764dc4dd18d6301fbbf6c8ed5ced9be SHA256 7667adc8203d7cb4716d269641d751b72a40b92433ea9ff916fd2eb54baf4b1f +MD5 483669a0028cd472931d6e3d9f123708 amarok-9999-r1.ebuild 2705 +RMD160 8795534ecb6875ee04562fdb3ac548fa5a9ad774 amarok-9999-r1.ebuild 2705 +SHA256 7667adc8203d7cb4716d269641d751b72a40b92433ea9ff916fd2eb54baf4b1f amarok-9999-r1.ebuild 2705 +MISC ChangeLog 32689 RMD160 32eedd4b71d75eb99df3647341a38e8a766afcad SHA1 cb5e1e2f0faf0048603acd93e0719c24b2d51c40 SHA256 26b8165ec260a7aa268114df2ba90c26169d4d8a9dc99f60a6f46565b1a04daa +MD5 965edea99e00d5fb1e034e103fd0ef2e ChangeLog 32689 +RMD160 32eedd4b71d75eb99df3647341a38e8a766afcad ChangeLog 32689 +SHA256 26b8165ec260a7aa268114df2ba90c26169d4d8a9dc99f60a6f46565b1a04daa ChangeLog 32689 MISC metadata.xml 266 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e SHA1 d41658ffae344562e8579d219bd3f746d4cba624 SHA256 c2f316075bb660460a285a5474235615f5946bb47df6e6f0c9c4de9ed64edf26 MD5 986cc6d7e9a21474e34336045796ffaa metadata.xml 266 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e metadata.xml 266 SHA256 c2f316075bb660460a285a5474235615f5946bb47df6e6f0c9c4de9ed64edf26 metadata.xml 266 -MD5 ecfb45bf9511daa1e0894c64f2ff6112 files/digest-amarok-1.4.3-r1 247 -RMD160 8eb0e628f823ab06d97dab32bc6a1e3476c37871 files/digest-amarok-1.4.3-r1 247 -SHA256 30a763884b75f16b9a733b1eeb468f2316f2b6ae1e7500459463fee5cbd94493 files/digest-amarok-1.4.3-r1 247 MD5 09d4216c683d6a633f4c8fb6dfe73719 files/digest-amarok-1.4.4-r3 503 RMD160 f2b5a9cb52037ec05f9aafc0ce89015d9ca015a2 files/digest-amarok-1.4.4-r3 503 SHA256 5684c57a46c61c81e4eb0204bdfd7b6baf02dd2e5f3613a76b1876d812fd5b23 files/digest-amarok-1.4.4-r3 503 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-amarok-9999 0 -RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-amarok-9999 0 -SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-amarok-9999 0 +MD5 09d4216c683d6a633f4c8fb6dfe73719 files/digest-amarok-1.4.4-r4 503 +RMD160 f2b5a9cb52037ec05f9aafc0ce89015d9ca015a2 files/digest-amarok-1.4.4-r4 503 +SHA256 5684c57a46c61c81e4eb0204bdfd7b6baf02dd2e5f3613a76b1876d812fd5b23 files/digest-amarok-1.4.4-r4 503 +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-amarok-9999-r1 0 +RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-amarok-9999-r1 0 +SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-amarok-9999-r1 0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFuP7IAiZjviIA2XgRAtCcAJ9D4ZCIlizBS3NAqJTimcXdi1PGrACgtxsE -Xd20inu7GG0w1H/oCrjzVuk= -=hOR+ +iD8DBQFFvLi5AiZjviIA2XgRAnSWAKCNZ4U33jEAN6q07Efj/i7K/sDRxACfa0t3 +UvY/C+mSWybEL25EcVsftww= +=j/Gp -----END PGP SIGNATURE----- diff --git a/media-sound/amarok/amarok-1.4.4-r3.ebuild b/media-sound/amarok/amarok-1.4.4-r3.ebuild index 3badf8e8a752..50afdb5ebddc 100644 --- a/media-sound/amarok/amarok-1.4.4-r3.ebuild +++ b/media-sound/amarok/amarok-1.4.4-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.4-r3.ebuild,v 1.7 2007/01/23 15:51:04 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.4-r3.ebuild,v 1.8 2007/01/28 14:52:30 flameeyes Exp $ LANGS="af ar az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja ka km ko lt ms nb nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta tg @@ -48,6 +48,9 @@ RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) ) DEPEND="${RDEPEND}" +RDEPEND="${RDEPEND} + !www-servers/mongrel" + need-kde 3.3 PATCHES="${WORKDIR}/${P}-gentoo/*.patch diff --git a/media-sound/amarok/amarok-1.4.3-r1.ebuild b/media-sound/amarok/amarok-1.4.4-r4.ebuild similarity index 52% rename from media-sound/amarok/amarok-1.4.3-r1.ebuild rename to media-sound/amarok/amarok-1.4.4-r4.ebuild index b038cd1fc3f5..d37e448ec3d6 100644 --- a/media-sound/amarok/amarok-1.4.3-r1.ebuild +++ b/media-sound/amarok/amarok-1.4.4-r4.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.3-r1.ebuild,v 1.11 2006/12/22 16:06:09 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.4-r4.ebuild,v 1.1 2007/01/28 14:52:30 flameeyes Exp $ -LANGS="az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja ka -km ko lt ms nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tg th tr uk uz -zh_CN zh_TW" +LANGS="af ar az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it +ja ka km ko lt ms nb nl nn pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta tg +th tr uk uz zh_CN zh_TW" LANGS_DOC="da de es et fr it nl pl pt pt_BR ru sv" USE_KEG_PACKAGING=1 @@ -19,16 +19,17 @@ S="${WORKDIR}/${P/_/-}" DESCRIPTION="Advanced audio player based on KDE framework." HOMEPAGE="http://amarok.kde.org/" -SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2" +SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2 + mirror://gentoo/${P}-gentoo.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="~amd64 ~x86 ~x86-fbsd" IUSE="aac kde mysql noamazon opengl postgres -visualization ipod ifp real njb" +visualization ipod ifp real njb mtp musicbrainz" # kde: enables compilation of the konqueror sidebar plugin -DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) ) +RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) ) >=media-libs/xine-lib-1.1.2_pre20060328-r8 >=media-libs/taglib-1.4 mysql? ( >=virtual/mysql-4.0 ) @@ -40,21 +41,22 @@ DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) ) aac? ( media-libs/libmp4v2 ) ifp? ( media-libs/libifp ) real? ( media-video/realplayer ) - njb? ( >=media-libs/libnjb-2.2.4 )" + njb? ( >=media-libs/libnjb-2.2.4 ) + mtp? ( media-libs/libmtp ) + musicbrainz? ( media-libs/tunepimp ) + =dev-lang/ruby-1.8*" -RDEPEND="${DEPEND} - dev-lang/ruby" +DEPEND="${RDEPEND}" -DEPEND="${DEPEND} - >=dev-util/pkgconfig-0.9.0" - -PATCHES="${FILESDIR}/${P}-playlist-encoding.patch" +RDEPEND="${RDEPEND} + www-servers/mongrel" need-kde 3.3 -src_compile() { - append-flags -fno-inline +PATCHES="${WORKDIR}/${P}-gentoo/*.patch + ${FILESDIR}/${P}+libgpod-0.4.0.patch" +src_compile() { # Extra, unsupported engines are forcefully disabled. local myconf="$(use_enable mysql) $(use_enable postgres postgresql) $(use_with opengl) --without-xmms @@ -65,11 +67,23 @@ src_compile() { $(use_with ifp) $(use_with real helix) $(use_with njb libnjb) - --without-musicbrainz - --without-libmtp + $(use_with mtp libmtp) + $(use_with musicbrainz) --with-xine --without-mas --without-nmm" kde_src_compile } + +src_install() { + kde_src_install + + # As much as I respect Ian, I'd rather leave Amarok to use mongrel + # from Portage, for security and policy reasons. + rm -rf "${D}"/usr/share/apps/amarok/ruby_lib/rbconfig \ + "${D}"/usr/share/apps/amarok/ruby_lib/mongrel* \ + "${D}"/usr/share/apps/amarok/ruby_lib/rubygems* \ + "${D}"/usr/share/apps/amarok/ruby_lib/gem* \ + "${D}"/usr/$(get_libdir)/ruby_lib +} diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999-r1.ebuild similarity index 81% rename from media-sound/amarok/amarok-9999.ebuild rename to media-sound/amarok/amarok-9999-r1.ebuild index 3b30f0e7fa01..d06c3b9af024 100644 --- a/media-sound/amarok/amarok-9999.ebuild +++ b/media-sound/amarok/amarok-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-9999.ebuild,v 1.3 2007/01/25 19:02:24 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-9999-r1.ebuild,v 1.1 2007/01/28 14:52:30 flameeyes Exp $ inherit kde subversion @@ -39,6 +39,9 @@ RDEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) ) DEPEND="${RDEPEND}" +RDEPEND="${RDEPEND} + www-servers/mongrel" + need-kde 3.3 S="${WORKDIR}/${PN}" @@ -78,3 +81,15 @@ src_compile() { kde_src_compile } + +src_install() { + kde_src_install + + # As much as I respect Ian, I'd rather leave Amarok to use mongrel + # from Portage, for security and policy reasons. + rm -rf "${D}"/usr/share/apps/amarok/ruby_lib/rbconfig \ + "${D}"/usr/share/apps/amarok/ruby_lib/mongrel* \ + "${D}"/usr/share/apps/amarok/ruby_lib/rubygems* \ + "${D}"/usr/share/apps/amarok/ruby_lib/gem* \ + "${D}"/usr/$(get_libdir)/ruby_lib +} diff --git a/media-sound/amarok/files/digest-amarok-1.4.3-r1 b/media-sound/amarok/files/digest-amarok-1.4.3-r1 deleted file mode 100644 index 08960adff75d..000000000000 --- a/media-sound/amarok/files/digest-amarok-1.4.3-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 b0b4f8952ad23705c70815d50fd0af52 amarok-1.4.3.tar.bz2 17175603 -RMD160 287d6652868f50023d8602941fdc99aed5296d22 amarok-1.4.3.tar.bz2 17175603 -SHA256 e9f6d8728d1c49467a2b72232c7ce907621e8e3792aa7dd9f206985b1450a847 amarok-1.4.3.tar.bz2 17175603 diff --git a/media-sound/amarok/files/digest-amarok-1.4.4-r4 b/media-sound/amarok/files/digest-amarok-1.4.4-r4 new file mode 100644 index 000000000000..262445ff5727 --- /dev/null +++ b/media-sound/amarok/files/digest-amarok-1.4.4-r4 @@ -0,0 +1,6 @@ +MD5 1eb17420bc9036303958da5a2567e611 amarok-1.4.4-gentoo.tar.bz2 2830 +RMD160 75c42ba3bab6aa363aa71bfd17d9532555abc040 amarok-1.4.4-gentoo.tar.bz2 2830 +SHA256 d874db4cd1b63084df4c20b26ef461e95c242579c4d6e4ca80ccff046d149b33 amarok-1.4.4-gentoo.tar.bz2 2830 +MD5 56a9aec42088c338b81252f8e0651781 amarok-1.4.4.tar.bz2 17635707 +RMD160 61cd2748ce0111f4ba388a71e9504abb7362b0d7 amarok-1.4.4.tar.bz2 17635707 +SHA256 760d30337cb73c86b9298e5c2c9836b3a753c39805b54f75b1eea82c15e9a0ea amarok-1.4.4.tar.bz2 17635707 diff --git a/media-sound/amarok/files/digest-amarok-9999 b/media-sound/amarok/files/digest-amarok-9999-r1 similarity index 100% rename from media-sound/amarok/files/digest-amarok-9999 rename to media-sound/amarok/files/digest-amarok-9999-r1 -- 2.26.2