diff options
| author |   Timothy Redaelli <drizzt@gentoo.org> | 2007-06-04 14:29:28 +0000 |
|---|---|---|
| committer | Timothy Redaelli <drizzt@gentoo.org> | 2007-06-04 14:29:28 +0000 |
| commit | 4c79f5828636860ff5186bec40893212b68bc5b2 (patch) | |
| tree | ea0cb367d79b4df7ad691f3f93213a93273cd59b | |
| parent | Add ~x86 keyword. (diff) | |
| download | drizzt-4c79f5828636860ff5186bec40893212b68bc5b2.tar.gz drizzt-4c79f5828636860ff5186bec40893212b68bc5b2.tar.bz2 drizzt-4c79f5828636860ff5186bec40893212b68bc5b2.zip | |
Fix.
svn path=/; revision=124
| -rw-r--r-- | media-sound/amarok/ChangeLog | 4 | ||||
| -rw-r--r-- | media-sound/amarok/Manifest | 11 | ||||
| -rw-r--r-- | media-sound/amarok/amarok-1.4.5-r1.ebuild | 23 | ||||
| -rw-r--r-- | media-sound/amarok/files/amarok-1.4.5-xinesux.patch | 11 |
4 files changed, 40 insertions, 9 deletions
diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog index a63c1d2..e9dd168 100644 --- a/media-sound/amarok/ChangeLog +++ b/media-sound/amarok/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 Jun 2007; Timothy Redaelli <drizzt@gentoo.org> + +files/amarok-1.4.5-xinesux.patch, amarok-1.4.5-r1.ebuild: + Fix. + 04 Jun 2007; Timothy Redaelli <drizzt@gentoo.org> ChangeLog: Add amarok with xine amd gstreamer use flag. diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest index e3453c1..f119eb1 100644 --- a/media-sound/amarok/Manifest +++ b/media-sound/amarok/Manifest @@ -2,13 +2,14 @@ Hash: SHA1 AUX amarok-1.4.5-magnatune.patch 873 RMD160 f9d68fce79b228c8eb894442a95447dbaec0179b SHA1 aacd742d79b91d19ab68edd5a38d1dd08459c7b9 SHA256 96848937bffca80b2e9eb338e4581b7600ee2957f26a32291b5337fffb04cfb9 +AUX amarok-1.4.5-xinesux.patch 468 RMD160 27316bf5dc4491320206d268431398fb8f0bfde8 SHA1 530825e7d896410ff301104b58578ce8a7c2dcfd SHA256 f0cb0a8d92afe9a9233a296a3042d3f9a90458d80c6ccda459b6d44baa29819a DIST amarok-1.4.5.tar.bz2 18034110 RMD160 c2bbfe06f3e613dfc7d3926d086024073390c712 SHA1 882dec8d30c10f609a1f5e21d2e91342e78304c5 SHA256 45aa7cafe2a46dd988cd5034ae19da988926eecb2ac90d3e6912c57e558108c8 -EBUILD amarok-1.4.5-r1.ebuild 2733 RMD160 36f59c7f05f4068244830dce16df11078d3f1851 SHA1 1fe1250efb98666385d3762843e3c22ef5b13c08 SHA256 cf86c39532722cca24d76f8b1c4f5f507f2c200388d2166cabb474e7324c5582 -MISC ChangeLog 230 RMD160 70b1dcc2d0175e5a56e440ab5319f5d4b171d9a0 SHA1 21a677811447e50b58562da4a9352574747b74c9 SHA256 2a979eaed9accbc4ba26cb74ba71085f0a4aea0641b3783ed0a3bfecc3040cdd +EBUILD amarok-1.4.5-r1.ebuild 3012 RMD160 1785869eaf5c9c35e854bc4222caf4497d44e4a2 SHA1 a5cef0ec744c01f18cd63fe9117ea42620cce60a SHA256 b585cd4f4aa5b123dbbe873352d2986804839fbb358200ed3c69e7f55932ae3b +MISC ChangeLog 351 RMD160 26ff699e48d830749d8939f3820973865a5450e9 SHA1 c0b0de801338bd53e7b0cf7b2b6ac528e121e26f SHA256 64c49ca2a4d822477a0f6c009a577941a96c8288ed79e9baac82e14738c785b3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.4 (GNU/Linux) -iD8DBQFGZAVJjJyKLBkBVroRAhKLAJ9BeqoVccnCP/dp1DEHG7Rfy7p9qQCghsxz -5TnlxWoDNWrye/xH40E3+2k= -=XTl7 +iD8DBQFGZCHzjJyKLBkBVroRArbDAJ9r02z1F0QZf+KW1UKOUoina/T7GACeJXwI +Q2vp3i4Ulpdlc95fXTa+ZnA= +=e/Za -----END PGP SIGNATURE----- diff --git a/media-sound/amarok/amarok-1.4.5-r1.ebuild b/media-sound/amarok/amarok-1.4.5-r1.ebuild index 796bb9e..9968e4d 100644 --- a/media-sound/amarok/amarok-1.4.5-r1.ebuild +++ b/media-sound/amarok/amarok-1.4.5-r1.ebuild @@ -23,7 +23,7 @@ SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="~amd64 ~x86" IUSE="aac kde mysql noamazon opengl postgres visualization ipod ifp real njb mtp musicbrainz daap xine gstreamer" # kde: enables compilation of the konqueror sidebar plugin @@ -52,10 +52,21 @@ RDEPEND="${RDEPEND} gstreamer? ( media-sound/yauap ) daap? ( www-servers/mongrel )" -PATCHES="${FILESDIR}/${P}-magnatune.patch" +PATCHES="${FILESDIR}/${P}-magnatune.patch ${FILESDIR}/${P}-xinesux.patch" need-kde 3.3 +pkg_setup() { + if ! use xine && ! use gstreamer; then + einfo + elog "As you did not pick xine or gstreamer use flag, building" + elog "xine only." + einfo + fi + + kde_pkg_setup +} + src_compile() { # Extra, unsupported engines are forcefully disabled. local myconf="$(use_enable mysql) $(use_enable postgres postgresql) @@ -70,11 +81,15 @@ src_compile() { $(use_with mtp libmtp) $(use_with musicbrainz) $(use_with daap) - $(use_with xine) - $(use_with gstreamer yauap) --without-mas --without-nmm" + if ! use xine && ! use gstreamer; then + myconf="${myconf} --with-xine" + else + myconf="${myconf} $(use_with xine) $(use_with gstreamer yauap)" + fi + kde_src_compile } diff --git a/media-sound/amarok/files/amarok-1.4.5-xinesux.patch b/media-sound/amarok/files/amarok-1.4.5-xinesux.patch new file mode 100644 index 0000000..14627e9 --- /dev/null +++ b/media-sound/amarok/files/amarok-1.4.5-xinesux.patch @@ -0,0 +1,11 @@ +--- amarok/configure.in.in.old 2007-06-04 15:16:54.000000000 +0200 ++++ amarok/configure.in.in 2007-06-04 15:20:59.000000000 +0200 +@@ -1166,7 +1166,7 @@ + # BEGIN DO_NOT_COMPILE CHECK + ############################################################################### + +-if test x$build_xine = xno -a x$build_helix = xno; then ++if test x$build_xine = xno -a x$build_helix = xno -a x$build_yauap = xno; then + + DO_NOT_COMPILE="$DO_NOT_COMPILE amarok" + no_engine=yes |