summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-03-19 10:18:26 +0000
committerJohannes Huber <johu@gentoo.org>2012-03-19 10:18:26 +0000
commit3c89f7c574a2ca291f75ba1eac392de54ea8abf2 (patch)
tree2d9ffa48a2eb5168d2a83fc29a70c0e61d41d688 /media-sound/tomahawk
parentVersion bump. (diff)
downloadhistorical-3c89f7c574a2ca291f75ba1eac392de54ea8abf2.tar.gz
historical-3c89f7c574a2ca291f75ba1eac392de54ea8abf2.tar.bz2
historical-3c89f7c574a2ca291f75ba1eac392de54ea8abf2.zip
Sync with overlay. Remove patch, adds dep.
Package-Manager: portage-2.2.0_alpha92/cvs/Linux i686
Diffstat (limited to 'media-sound/tomahawk')
-rw-r--r--media-sound/tomahawk/ChangeLog5
-rw-r--r--media-sound/tomahawk/Manifest18
-rw-r--r--media-sound/tomahawk/tomahawk-9999.ebuild13
3 files changed, 19 insertions, 17 deletions
diff --git a/media-sound/tomahawk/ChangeLog b/media-sound/tomahawk/ChangeLog
index d708f562fb67..5f5c5efd4105 100644
--- a/media-sound/tomahawk/ChangeLog
+++ b/media-sound/tomahawk/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-sound/tomahawk
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.7 2012/03/19 10:15:27 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/ChangeLog,v 1.8 2012/03/19 10:18:26 johu Exp $
+
+ 19 Mar 2012; Johannes Huber <johu@gentoo.org> tomahawk-9999.ebuild:
+ Sync with overlay. Remove patch, adds dep.
*tomahawk-0.4.0 (19 Mar 2012)
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 5464609780b8..474ccb9342cb 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -6,17 +6,17 @@ DIST tomahawk-0.3.3.tar.bz2 4651817 RMD160 d8eae3c37e2915904a096e0ef64e488ff9fec
DIST tomahawk-0.4.0.tar.bz2 4771856 RMD160 b8ba57d86d9acbf2ec2bff48d5466a3dc1613cdb SHA1 4e480fb7a7c13e5216f424942ee65c8cb814a121 SHA256 3e1e2987cb8763bad7f4b39bc930e1eb14cd845c71700f4250d942615b61870d
EBUILD tomahawk-0.3.3.ebuild 1914 RMD160 734427c9600a4d5cdd0a2d6de6519b0b0c5c88d8 SHA1 9eddf699c6041cdbf73bb4ef03573acca05c61f6 SHA256 fe1bc1b197ca0a08df41a95df8311ebc7c0b669edfe5bd9b9133328131920d54
EBUILD tomahawk-0.4.0.ebuild 1950 RMD160 064bfc254f9ba4cac4da10193cbed97cf70af81c SHA1 fadf0af5398f5f1140e8008abf3645458dd28a23 SHA256 529f9a879707ec166b193cef58600e53bb5b3aa80b4079e5d0e8b6a65434fe8c
-EBUILD tomahawk-9999.ebuild 1913 RMD160 faf22d04fb0b8e3604e2efad614dace0997ee2db SHA1 0edfc958b0fa155810952b549b105f6447d862a2 SHA256 c30892e29b0e7dabda5664aab86f9e732899958dfe056edda73bab689b2d517c
-MISC ChangeLog 1631 RMD160 8eee7962d81acc5a7e1779a5d706f3b6e256fe01 SHA1 b94762dda84ee6cce9053446e4224fa7bde07830 SHA256 22f048feaab685751017accef879fdec51c406ade5f49442ad78789a210b4144
+EBUILD tomahawk-9999.ebuild 1889 RMD160 2020fc4f90f73d06ccf10036c7ba2e3f1c74d5eb SHA1 f31b174d13d0e740637644a1b999ee7ca46ef2f3 SHA256 a5fd6a962adc0b1db98b635e3879cf392d56ac122c22cc1ef4ba3ba3086abf6c
+MISC ChangeLog 1747 RMD160 2caed2ed4f5e6d558e899d5eb173e368f5fe03d1 SHA1 b312f73dda5d765154a5a3d5714b03e5780ff2aa SHA256 8d186813c1fc9e7ba157241dc06c29f722de4a980da752694d356b09c3240278
MISC metadata.xml 396 RMD160 998d05e2f8ef6d73f552532a3a1f1aef2eeb67df SHA1 1bbeb16a3c3156e6bd514117777cf3112c8e70fe SHA256 394b94c6342f4a7a45ac02a410693ad6ff4b1cbeba8336bb31431d8aa40bde0a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBCgAGBQJPZwieAAoJEO+t9ga+3I3acnkH/j9zaVXe47IsMRJOJ4p3uLS8
-b8mF2UCNQXZ3YZTrnvsJlPdI9CJE3uBY8nGH/u+Rp7VbUBp1rKkV6PcIpS74XArP
-NLWwv2M7TGBD033JIVdfts+CERGI0lj4+OskU/u5qkPWZZzK0oZFRJ667NnixG9H
-+TKP17YNpkdqEOj5/c8g3ZIGxfoLtnIo831C1z5NqHu5qLLqLP+vxUeZNXC+Y0Q1
-ZWi6ACS9SNDSRisXBYe2h4lO96dsm/C8BF0SjLS+l8WfiTzxS8MoOhTSh63OGA6i
-SQ5RrV5YGgModQU77CD4AWu01PrXgMHRelaCfrOtMOOCbgx1PU4RYlWU3BLqPsY=
-=PLVJ
+iQEcBAEBCgAGBQJPZwlHAAoJEO+t9ga+3I3acZgH/jZ1TgMtJ5uO4Rm+POX8cVXL
+ULuU7GJFlT3A/+DF6Z/3sw8/Gh+RBaxoCVI12nrLBi77P25xysGU2ckQp9WL91ST
+JNM66pV2EISNVzS2oNCY9CA6eySt7BKp1SaK1cP8cQxDDZpYgyS9XMyRIw7P8bT5
+A+u+GJZYScM7cgM+oOqgAHnk0IWd0ilii64VE5UKJy2CGXis2Nm5tVrmXm7YxNdk
+Qdcy9+6efOGsH26FtYZeha5RSa87g6ynBt26dYQVYRIdzMZXvL4pkbgL0VZNJVyO
+a6ZbcQAtUmY96gZYNel2RjR2qUt41fEzq9C1FqJNKTB0VYCepq6kGgeTWcHib7k=
+=Lnh2
-----END PGP SIGNATURE-----
diff --git a/media-sound/tomahawk/tomahawk-9999.ebuild b/media-sound/tomahawk/tomahawk-9999.ebuild
index 1a5f0ece1713..27e91866e2c3 100644
--- a/media-sound/tomahawk/tomahawk-9999.ebuild
+++ b/media-sound/tomahawk/tomahawk-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.4 2011/12/08 13:07:27 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/tomahawk/tomahawk-9999.ebuild,v 1.5 2012/03/19 10:18:26 johu Exp $
EAPI=4
@@ -25,6 +25,7 @@ SLOT="0"
IUSE="debug fftw jabber libsamplerate +resolver twitter"
DEPEND="
+ app-crypt/qca
>=dev-cpp/clucene-2.3.3.4
>=dev-libs/boost-1.41
>=dev-libs/qjson-0.7.1
@@ -45,11 +46,9 @@ DEPEND="
)
twitter? ( net-libs/qtweetlib )
"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.3.2-remove-quazip.patch"
-)
+RDEPEND="${DEPEND}
+ app-crypt/qca-ossl
+"
src_configure() {
mycmakeargs=(