diff options
| author | Andreas K. Huettel (dilfridge) <mail@akhuettel.de> | 2010-09-01 23:37:52 +0200 |
|---|---|---|
| committer | Andreas K. Huettel (dilfridge) <mail@akhuettel.de> | 2010-09-01 23:37:52 +0200 |
| commit | c7187d2c3e003545e5d2569cbd596fe3818bb71b (patch) | |
| tree | f954ef1a7dc4aeaf6791666f5e187c704aa91cae | |
| parent | 4de19bf0e2d00bba1dce1bcb675b9089574d8b62 (diff) | |
| download | kde-c7187d2c3e003545e5d2569cbd596fe3818bb71b.tar.gz kde-c7187d2c3e003545e5d2569cbd596fe3818bb71b.tar.bz2 kde-c7187d2c3e003545e5d2569cbd596fe3818bb71b.zip | |
[net-p2p/ktorrent,net-libs/libktorrent] Merged changes from tree on scarabeus' request
| -rw-r--r-- | net-libs/libktorrent/Manifest | 2 | ||||
| -rw-r--r-- | net-libs/libktorrent/libktorrent-9999.ebuild | 9 | ||||
| -rw-r--r-- | net-p2p/ktorrent/Manifest | 2 | ||||
| -rw-r--r-- | net-p2p/ktorrent/ktorrent-9999.ebuild | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/net-libs/libktorrent/Manifest b/net-libs/libktorrent/Manifest index 08264169d53..1a99c9486b3 100644 --- a/net-libs/libktorrent/Manifest +++ b/net-libs/libktorrent/Manifest @@ -1,2 +1,2 @@ -EBUILD libktorrent-9999.ebuild 1182 RMD160 3abca15a67702507aa4ae494689f32e145ef7f06 SHA1 3b7ba66a6fc78af392312cc20ff165ecb3907e01 SHA256 20e5aa24403e44deae38d2d3a4e79fe1a027dd822e33c0f721dedbcd65c4eabd +EBUILD libktorrent-9999.ebuild 1148 RMD160 eb2cc2791996e5469a995aebdcfb1b7b045263b1 SHA1 272dd8fc6bbac4167b7028f2facd041d3796e052 SHA256 b096123b1be9ff410ddc8c7616584a0fc2fa4b9e24c5196c26ad3adfea8fd734 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a diff --git a/net-libs/libktorrent/libktorrent-9999.ebuild b/net-libs/libktorrent/libktorrent-9999.ebuild index 400f7e1491c..985f4cd8223 100644 --- a/net-libs/libktorrent/libktorrent-9999.ebuild +++ b/net-libs/libktorrent/libktorrent-9999.ebuild @@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]] ; then KMNAME="extragear/network" else # upstream likes to skip that _ in beta releases - KTORRENT_VERSION="4.0.2" + KTORRENT_VERSION="4.0.3" MY_PV="${PV/_/}" MY_P="${PN}-${MY_PV}" @@ -30,16 +30,15 @@ KEYWORDS="" SLOT="4" IUSE="debug doc" -COMMONDEPEND=" +RDEPEND=" app-crypt/qca:2 dev-libs/gmp " -DEPEND="${COMMONDEPEND} +DEPEND="${RDEPEND} dev-libs/boost sys-devel/gettext doc? ( app-doc/doxygen[-nodot] ) " -RDEPEND="${COMMONDEPEND}" src_compile() { cmake-utils_src_compile @@ -48,7 +47,7 @@ src_compile() { } src_install() { - use doc && HTML_DOCS=("${CMAKE_BUILD_DIR}/apidocs/html/") + use doc && HTML_DOCS=( "${CMAKE_BUILD_DIR}/apidocs/html/" ) cmake-utils_src_install } diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest index 944a153bf34..4d3ce948f71 100644 --- a/net-p2p/ktorrent/Manifest +++ b/net-p2p/ktorrent/Manifest @@ -1,2 +1,2 @@ -EBUILD ktorrent-9999.ebuild 2735 RMD160 18a851bdde4c31da19fa3c517999dffd0e4a468d SHA1 8d13d4e5d8528d00201dd33d65f98b6790921239 SHA256 55b16acddac0e9a02fd76f21f72c4ebd59bc78f676792f9eb176cf1f5697fe58 +EBUILD ktorrent-9999.ebuild 2735 RMD160 e4034e29d119e2852ed09525659dfce2fcc9f079 SHA1 75b1a5dc327b1d382f3ba76586c99952663134ca SHA256 1de92fc9dbc4166159aefe47419b635cd96e50983f3665dc65ea9709557df991 MISC metadata.xml 1425 RMD160 57a8dc4f1f121a577f042faea242dcb4bada8f7a SHA1 85f5015342bc1ffbedc1da1171260c05ee6b4eb8 SHA256 589714ec7f93ed39929de5c133b7aa98714b4223298d98b7c0585e6263258c30 diff --git a/net-p2p/ktorrent/ktorrent-9999.ebuild b/net-p2p/ktorrent/ktorrent-9999.ebuild index 8dbbc792ba4..c965589737f 100644 --- a/net-p2p/ktorrent/ktorrent-9999.ebuild +++ b/net-p2p/ktorrent/ktorrent-9999.ebuild @@ -32,7 +32,7 @@ IUSE="+bwscheduler debug +downloadorder +infowidget +ipfilter +kross +logviewer +upnp webinterface +zeroconf" COMMONDEPEND=" - >=net-libs/libktorrent-1.0.2 + >=net-libs/libktorrent-1.0.3 mediaplayer? ( >=media-libs/taglib-1.5 ) plasma? ( >=kde-base/libtaskmanager-${KDE_MINIMAL} ) rss? ( |