From dc53e5004f02f1351101d27d40082ab537cf200d 2014-10-14 16:07:05 From: Richard H Date: 2014-10-14 16:07:05 Subject: [PATCH] update net-misc/pyload to 0.4.9 --- diff --git a/net-misc/pyload/Manifest b/net-misc/pyload/Manifest index d9b8289da5dece92d9946b3317f68fff978cfc6a..a1471acff5d5e462e5190c99689cf15ebb3930b3 100644 --- a/net-misc/pyload/Manifest +++ b/net-misc/pyload/Manifest @@ -1,12 +1,7 @@ -AUX pyload 382 SHA256 fab733b232a0591f1427175f688dc4171f87bbea2c506b23291fb4742e228196 SHA512 4be74703307d26b71f415f3ea6cba721f1b33798638986f1836bb79ca7ac92398416833f746f4e2f4544e7d9c2ffc1e585487550b781015f04b05889a231befe WHIRLPOOL 1cc51d7b4f71f78cd2c904604ca3485a64e59708bdba78932eb358db067c6a1adf51d2552802ef288b4cde57c9cf6aafb5885e673ba84a4034029a20688caf13 -AUX pyload-0.4.8-locale-fix.patch 5214 SHA256 4a4bf41af98a2d914646c4aab6064fee3e1c21a61cfacac5c16c449f42f4875d SHA512 d8f867e3818dd18582e37c4017dd87e45450f9652e43ec70c7a7c673918cb40262535f1cc3fa3e5a6b440b8dcd1f4e6973f6c79cf4aeb240f112db075bb7cece WHIRLPOOL 76f752e1c1cf7f57d6755cd5b67bfcc8b7b5d251169d4da6b5483de17a159aa35d825a5a81c002cd480f1682b77c2568b1b1cec9c37873d00e6e860d078f365b -AUX pyload-0.4.8-pid.patch 1638 SHA256 c9d14523dd6c638c2ec7b1019d80386b1130e10f113daade8bc6306c58e66fd7 SHA512 0552e2f6c47e76bb43b5ccb605f07c9d7e3ddb64174e4a5c0d5b786d70e113c4b61a363306539bd1e2c207168549c667261f1186c40be96acd980c60f53c08e5 WHIRLPOOL 8ac478037f7732de0b8d8ff380615a1b993cbf590fa83e34a404e97de4727ea333cdf70e076204d9f65f189e449117d3a528c66f7f6404d2518419cf96c3a159 -AUX pyload-0.4.8-sanitize-config.patch 877 SHA256 cb5d03cc8c7eca9457166c25f4e4d928d735fd14dc7fc049a24168cc85cb9fb3 SHA512 e9023ac71199312adb172ce05942f6143bacd7eca5a735ac2f2619f179e27e7e17b1b6d3e8b6f3e916d02db9cb1641cb62b6ce05cf1c5218990c386119faab19 WHIRLPOOL 46547cb16b45970d87dc1c9daf9f1c9428bfe323f64ca267a21002efc2212bd6190ae0aafa18ed9e72f4e2893639ffc81d02cc656ee5b31b5c0df818d8bf3924 +AUX pyload-0.4.9-PIL.patch 2534 SHA256 2fdccc42e7824d3cc2899dc2372ed1a9073266978a2ac5ed22b1b602f370563c SHA512 e9b2e7f03a2b81c885640676d5a83d9ba3fffa9d2bc1c7032bc475ff465a98a0b93a5b7242875c3c079624dd4d6128c7cad9f10a974107d48666af94e26db1d3 WHIRLPOOL f9ea6f64c8aa788a8e90c2775e9ecf4481214c5cba8acdfd393c3474a7d03b63e511466365b48fe72398594f051e4cb3c05d637cde58975fc7d2eb00fe465456 AUX pyload-0.4.9-sanitize-config.patch 834 SHA256 36bffbaa3099c52952582f6e69931b5297c500a1e54d641e2b9ee547c1cfa60f SHA512 2b78a9ba74da93409f786fd32ae56cca8858953227314779f86aa6bddec06d6b373ddd78528df0aa5e7657c0c201ba6b0b6bfded98dae60d27ecdcce5060d15f WHIRLPOOL 97cc27681ba723f553aaf033472dd82dda36d5cbc9212bdce48a2d3b7e5039e2e2364a75e87af0093c89d77af80bc04fd13a1dc4eba7b7e8f1093b572eab53b4 AUX pyload.confd 193 SHA256 35fc29ce2c9feccd2946ac41795560521155f34183f3cd3fd5ea6d82c9afd117 SHA512 942a1462a1f10a8548e571fa51c124c0bf2ac85a317aaa7f1fc896084c068b0c460507c74ae938725740dea742744ab0eb3cb30b0471ff33c371738aaf227e45 WHIRLPOOL a6346ba0d19475d81634f5516f7619c28fe6d7f91be4328081d4cdf113c3a001703625af62aef3ebe4c04d5453c34827b4db13f5a8a82e61d23ac66cf9ffcab1 -AUX pyload.init 373 SHA256 70b96bc562153d5336d6ea69e3601f22751b6103e6cb5266b98b98c8dfa6d311 SHA512 827e6a9ebad3aaa6655936cbb7162ed651021c94edf4d04fdbdce5922521ae58a7fcb631a2d38217fe2f33db4dcf711ae2470d2c8a7434952337582e2fd6ad0e WHIRLPOOL ffa69838a1cfd06f24a8ed6e7f114e748e8e0f8d0643e9bad579fb6c2eece19801a33df367c9232a51dc2e6a20482a26a8226b52a0b5b9766b396a83f553e2a5 -AUX pyload.service 160 SHA256 b61111c844e289fc15d6e30e0f1b4c1721e7939c756765f82d5b0a587a4bbf23 SHA512 82d3c9c2939e8a84b373f7941b95b35f83e5bb6f5970476eb34e1874843e74665985574476f7a285749379c22540b9d304b0e5a17249be9cdf02e4dc580785a7 WHIRLPOOL 87c66b8e7737296c4b402751d3ab91bf4114e50520b5de51aa89cec1f4f23a9700be2d3e9e71190be382593e9aa48fe621ad76200e219beedd5bf02176d3397f -DIST pyload-src-v0.4.8.zip 1358271 SHA256 3a198644f123378105ab99de6dde63e033d7557696601f5394cc9107b7f722ef SHA512 f605583b033d5a4a63139f59b2d29717d66023db32b83f5d819de6b9316e6c586de08e57bde94ee87c0a9e30bbeca5ca4a5bc7fca4b326d4817ed3ad02a93ef4 WHIRLPOOL ef920f571ef0bf83d76824db970a96c43b43e0264c969cbc87e1d58988169f0d11f990229cdfa620371c53363bf16649dde82b022450b5588b87b19394fd1cb6 +AUX pyload.initd 373 SHA256 70b96bc562153d5336d6ea69e3601f22751b6103e6cb5266b98b98c8dfa6d311 SHA512 827e6a9ebad3aaa6655936cbb7162ed651021c94edf4d04fdbdce5922521ae58a7fcb631a2d38217fe2f33db4dcf711ae2470d2c8a7434952337582e2fd6ad0e WHIRLPOOL ffa69838a1cfd06f24a8ed6e7f114e748e8e0f8d0643e9bad579fb6c2eece19801a33df367c9232a51dc2e6a20482a26a8226b52a0b5b9766b396a83f553e2a5 +AUX pyload.service 179 SHA256 645addcff8fed4b8ba5e4aa7728e27810555d39596ca2048f8f6dbf10cc64974 SHA512 311144cfee847e2c26d3079619f9b0bf9c90135787fada0a8631e298ccac9f701ec843eb30f86569d8d29d9f51334d5486a491d3dcafc4ec7231b0593e6f905d WHIRLPOOL 667aae8541a5083949dfd10b1ad13a55159d4ddb550fa5437f16d76ae2b7028f38e000396a4160f8f4a429c4583c3656576860ec5cb1a86c532b2bd5a24b707c DIST pyload-src-v0.4.9.zip 1582931 SHA256 f937631d376216bc830d6ffcd5b4ecb1806afd4012a184849da1a333a7ba0016 SHA512 6265602073279763c5393b958ec2cc6825d51e872556d2f2141db1e2afd9a2aaded8275aac0576526f96863d768bc9ff3669e7ff31e7b9fb5c5f655bba920a8e WHIRLPOOL abe9e244cdba73e5cd0e1d0de072c52d00ca8e44ae6f7979235427402804aeb59ebcaf01a85a3696c1292c276f30eec489f0c3cf32680fef158139ca7ed14b8d -EBUILD pyload-0.4.8.ebuild 3159 SHA256 5b8dfeaf2950ace4a121679393a0769b987b7e078b782e55c3ccdb70da8e800c SHA512 f5c05e299d3c14998f29a14ab0fe9094b59b435b66e4d17465e0c7b531b366a4c13608bdcfd21c39565e21c0d6401d5407dce9bbb7f63d7ec66cdd4a12759781 WHIRLPOOL 4403700c6c733ebac32ddbc3890f2b4721254894ea561916960f570b03663979a6239b1606869dbe0699a16e3ab7fb2fa4d2c06e186c844f2d216a5225a1bf5b -EBUILD pyload-0.4.9.ebuild 3852 SHA256 f757e1b36e32c5e5936a462dae55acc1824f0f53d367df3567606bc68312cbdf SHA512 ea74b4f7f90b746b835f5f3d503dcff72dcde1bc66ce55189efe65f75978d1e669e5550e44e023935f2dba48ca7ab5be8bd84be83625a6de95d41cd090e9b4a1 WHIRLPOOL fc7a8c516b8dbb9f567d9db5f2f0ab466a0e1deba13c33f3c870fa1a25f0f511c84f74bbfcf0801d8c418175473c322b496885c257e59143b15e2bc3bd54af6d +EBUILD pyload-0.4.9.ebuild 3764 SHA256 fb3ea36d71a8524ec04a802ee0a2cac96f7f3ca44f2085410d958297b4ba41ee SHA512 feca54d0bfca4dfd81162c764a595c2b9ed2552b83ccd4c476a4f5f01874d716eeb36093408a7e99abf435a9d65902fe420f21e315dd25a6b2a7921eade711b3 WHIRLPOOL 6e1828e433fa4a070beca31f51bd4a58732426323a035408b73c956ca19a2a299e31879974db9ddc679563542f1afa8f3ba1aa609ae5cc12cff05d779fd628ef diff --git a/net-misc/pyload/files/pyload b/net-misc/pyload/files/pyload deleted file mode 100644 index 9d2e610e5f92a91c76674dbbbd706befac6cdb42..0000000000000000000000000000000000000000 --- a/net-misc/pyload/files/pyload +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/runscript - -NAME="PyLoad Daemon" -PIDFILE=/var/run/pyload.pid - -depend() { - need net -} - -start() { - ebegin "Starting PyLoad" - start-stop-daemon --start --quiet --background \ - --pidfile ${PIDFILE} \ - --exec /usr/bin/env python2 /opt/pyload/pyLoadCore.py -- - eend $? -} - -stop() { - ebegin "Stopping PyLoad" - start-stop-daemon --stop --quiet \ - --pidfile ${PIDFILE} - eend $? -} diff --git a/net-misc/pyload/files/pyload-0.4.8-locale-fix.patch b/net-misc/pyload/files/pyload-0.4.8-locale-fix.patch deleted file mode 100644 index e15e2366d16a639d2ea81a912115a3f11323cd4f..0000000000000000000000000000000000000000 --- a/net-misc/pyload/files/pyload-0.4.8-locale-fix.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -urpN pyload.orig/module/setup.py pyload.new/module/setup.py ---- pyload.orig/module/setup.py 2011-10-04 14:55:18.000000000 +0200 -+++ pyload.new/module/setup.py 2011-11-24 03:03:29.494117957 +0100 -@@ -44,7 +44,10 @@ class Setup(): - - langs = self.config.getMetaData("general", "language")["type"].split(";") - lang = self.ask(u"Choose your Language / Wähle deine Sprache", "en", langs) -- translation = gettext.translation("setup", join(self.path, "locale"), languages=["en", lang]) -+ if not exists(join(self.path, "locale")): -+ translation = gettext.translation("setup", "/usr/share/pyload/locale", languages=["en", lang]) -+ else: -+ translation = gettext.translation("setup", join(self.path, "locale"), languages=["en", lang]) - translation.install(True) - - # print "" -@@ -335,7 +338,12 @@ class Setup(): - - def set_user(self): - -- translation = gettext.translation("setup", join(self.path, "locale"), languages=["en", self.config["general"]["language"]]) -+ if not exists(join(self.path, "locale")): -+ translation = gettext.translation("setup", "/usr/share/pyload/locale", -+ languages=["en", self.config["general"]["language"]]) -+ else: -+ translation = gettext.translation("setup", join(self.path, "locale"), -+ languages=["en", self.config["general"]["language"]]) - translation.install(True) - - from module.database import DatabaseBackend -diff -urpN pyload.orig/module/web/webinterface.py pyload.new/module/web/webinterface.py ---- pyload.orig/module/web/webinterface.py 2011-10-04 14:55:18.000000000 +0200 -+++ pyload.new/module/web/webinterface.py 2011-11-24 03:00:58.256222754 +0100 -@@ -95,7 +95,11 @@ if PREFIX: - else: - env.filters["url"] = lambda x: PREFIX + x if x.startswith("/") else x - --translation = gettext.translation("django", join(PYLOAD_DIR, "locale"), -+if not exists(join(PYLOAD_DIR, "locale")): -+ translation = gettext.translation("django", "/usr/share/pyload/locale", -+ languages=["en", config.get("general","language")]) -+else: -+ translation = gettext.translation("django", join(PYLOAD_DIR, "locale"), - languages=["en", config.get("general","language")]) - translation.install(True) - env.install_gettext_translations(translation) -diff -urpN pyload.orig/pyLoadCli.py pyload.new/pyLoadCli.py ---- pyload.orig/pyLoadCli.py 2011-10-04 14:55:18.000000000 +0200 -+++ pyload.new/pyLoadCli.py 2011-11-24 03:00:58.256222754 +0100 -@@ -493,7 +493,11 @@ if __name__ == "__main__": - for opt in configFile.items("cli"): - config[opt[0]] = opt[1] - -- translation = gettext.translation("pyLoadCli", join(pypath, "locale"), -+ if not exists(join(pypath, "locale")): -+ translation = gettext.translation("pyLoadCli", "/usr/share/pyload/locale", -+ languages=["en", config["language"]]) -+ else: -+ translation = gettext.translation("pyLoadCli", join(pypath, "locale"), - languages=["en", config["language"]]) - translation.install(unicode=True) - -diff -urpN pyload.orig/pyLoadCore.py pyload.new/pyLoadCore.py ---- pyload.orig/pyLoadCore.py 2011-10-04 14:55:18.000000000 +0200 -+++ pyload.new/pyLoadCore.py 2011-11-24 03:00:58.257222786 +0100 -@@ -277,7 +277,11 @@ class Core(object): - - self.config = ConfigParser() - -- translation = gettext.translation("pyLoad", self.path("locale"), -+ if not exists(self.path("locale")): -+ translation = gettext.translation("pyLoad", "/usr/share/pyload/locale", -+ languages=["en", self.config['general']['language']]) -+ else: -+ translation = gettext.translation("pyLoad", self.path("locale"), - languages=["en", self.config['general']['language']]) - translation.install(True) - -diff -urpN pyload.orig/pyLoadGui.py pyload.new/pyLoadGui.py ---- pyload.orig/pyLoadGui.py 2011-10-04 14:55:18.000000000 +0200 -+++ pyload.new/pyLoadGui.py 2011-11-24 03:00:58.257222786 +0100 -@@ -34,6 +34,7 @@ from os.path import abspath - from os.path import join - from os.path import basename - from os.path import commonprefix -+from os.path import exists - - from module import InitHomeDir - from module.gui.ConnectionManager import * -@@ -77,7 +78,10 @@ class main(QObject): - parser = XMLParser(join(self.path, "module", "config", "gui_default.xml")) - lang = parser.xml.elementsByTagName("language").item(0).toElement().text() - -- translation = gettext.translation("pyLoadGui", join(pypath, "locale"), languages=["en", str(lang)]) -+ if not exists(join(pypath, "locale")): -+ translation = gettext.translation("pyLoadGui", "/usr/share/pyload/locale", languages=["en", str(lang)]) -+ else: -+ translation = gettext.translation("pyLoadGui", join(pypath, "locale"), languages=["en", str(lang)]) - try: - translation.install(unicode=(True if sys.stdout.encoding.lower().startswith("utf") else False)) - except: diff --git a/net-misc/pyload/files/pyload-0.4.8-pid.patch b/net-misc/pyload/files/pyload-0.4.8-pid.patch deleted file mode 100644 index dc3360861bad6bcd9fbd1a1d26df5df973568838..0000000000000000000000000000000000000000 --- a/net-misc/pyload/files/pyload-0.4.8-pid.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -urpN pyload.orig/pyLoadCore.py pyload.new/pyLoadCore.py ---- pyload.orig/pyLoadCore.py 2011-10-04 14:55:18.000000000 +0200 -+++ pyload.new/pyLoadCore.py 2011-11-23 05:54:59.042425874 +0100 -@@ -83,14 +83,16 @@ class Core(object): - - if len(argv) > 1: - try: -- options, args = getopt(argv[1:], 'vchdusq', -- ["version", "clear", "clean", "help", "debug", "user", "setup", "configdir=", "changedir", "daemon", -+ options, args = getopt(argv[1:], 'vchdusqp:', -+ ["pidfile=","version", "clear", "clean", "help", "debug", "user", "setup", "configdir=", "changedir", "daemon", - "quit", "status"]) - - for option, argument in options: - if option in ("-v", "--version"): - print "pyLoad", CURRENT_VERSION - exit() -+ elif option in ("-p", "--pidfile"): -+ self.pidfile=argument - elif option == "--daemon": - self.daemon = True - elif option in ("-c", "--clear"): -@@ -152,6 +154,7 @@ class Core(object): - print " -u, --user", " " * 13, "Manages users" - print " -d, --debug", " " * 12, "Enable debug mode" - print " -s, --setup", " " * 12, "Run Setup Assistent" -+ print " -p, --pidfile ", "Set Name of pidfile" - print " --configdir=", " " * 6, "Run with as config directory" - print " --changedir", " " * 12, "Change config dir permanently" - print " --daemon", " " * 15, "Daemonmize after start" diff --git a/net-misc/pyload/files/pyload-0.4.8-sanitize-config.patch b/net-misc/pyload/files/pyload-0.4.8-sanitize-config.patch deleted file mode 100644 index 2426b347dc9f2839aaf8f238ef7dfa3c8a8b6a6d..0000000000000000000000000000000000000000 --- a/net-misc/pyload/files/pyload-0.4.8-sanitize-config.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urpN pyload.orig/module/config/default.conf pyload.new/module/config/default.conf ---- pyload.orig/module/config/default.conf 2011-10-04 14:55:17.000000000 +0200 -+++ pyload.new/module/config/default.conf 2011-11-23 21:35:30.017800846 +0100 -@@ -2,7 +2,7 @@ version: 1 - - remote - "Remote": - int port : "Port" = 7227 -- ip listenaddr : "Adress" = 0.0.0.0 -+ ip listenaddr : "Adress" = 127.0.0.1 - bool nolocalauth : "No authentication on local connections" = True - ssl - "SSL": - bool activated : "Activated"= False -@@ -12,7 +12,7 @@ webinterface - "Webinterface": - bool activated : "Activated" = True - builtin;threaded;fastcgi;lightweight server : "Server" = builtin - bool https : "Use HTTPS" = False -- ip host : "IP" = 0.0.0.0 -+ ip host : "IP" = 127.0.0.1 - int port : "Port" = 8001 - str template : "Template" = default - str prefix: "Path Prefix" = diff --git a/net-misc/pyload/files/pyload.init b/net-misc/pyload/files/pyload.init deleted file mode 100644 index 1a1d0add27602c7894840c23c29398ff3a682010..0000000000000000000000000000000000000000 --- a/net-misc/pyload/files/pyload.init +++ /dev/null @@ -1,22 +0,0 @@ -#!/sbin/runscript - -NAME="PyLoad Daemon" - -depend() { - need net -} - -start() { - ebegin "Starting PyLoad" - start-stop-daemon --start --quiet \ - --pidfile ${PIDFILE} \ - --exec /usr/bin/pyLoadCore -- --configdir=${CONFIGDIR} --daemon -p ${PIDFILE} ${OPTIONS} - eend $? -} - -stop() { - ebegin "Stopping PyLoad" - start-stop-daemon --stop --quiet \ - --pidfile ${PIDFILE} - eend $? -} diff --git a/net-misc/pyload/files/pyload.service b/net-misc/pyload/files/pyload.service index e876a44766e78711209519d651ccc00a461f574e..734972fd64675761b55d793a011057d784bd371d 100644 --- a/net-misc/pyload/files/pyload.service +++ b/net-misc/pyload/files/pyload.service @@ -4,6 +4,7 @@ After=network.target [Service] ExecStart=/usr/bin/env python2 /opt/pyload/pyLoadCore.py +StandardOut=syslog [Install] WantedBy=multi-user.target diff --git a/net-misc/pyload/pyload-0.4.8.ebuild b/net-misc/pyload/pyload-0.4.8.ebuild deleted file mode 100644 index 29b8201c7003d96007d951f2cc77118d1c51d818..0000000000000000000000000000000000000000 --- a/net-misc/pyload/pyload-0.4.8.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3 - -PYTHON_DEPEND="2" -PYTHON_USE_WITH="sqlite" - -inherit base eutils python systemd - -if [[ ${PV} == *9999 ]]; then - EHG_REPO_URI="http://bitbucket.org/spoob/pyload/" - inherit mercurial -else - SRC_URI="http://get.pyload.org/static/${PN}-src-v${PV}.zip" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="A fast, lightweight and full featured download manager for many One-Click-Hoster." -HOMEPAGE="http://www.pyload.org" -LICENSE="GPL-3" -SLOT="0" -IUSE="captcha clicknload container curl qt4 rar ssl systemd" - -DEPEND="app-arch/unzip" - -RDEPEND="${DEPEND} - dev-python/beautifulsoup - dev-python/beaker - dev-python/feedparser - dev-python/simplejson - captcha? ( dev-python/imaging app-text/tesseract ) - clicknload? ( || ( dev-lang/spidermonkey dev-java/rhino ) ) - container? ( dev-python/pycrypto ) - curl? ( dev-python/pycurl ) - qt4? ( dev-python/PyQt4 ) - rar? ( app-arch/unrar ) - ssl? ( dev-python/pycrypto dev-python/pyopenssl )" - -#clicknload? ( || ( ... ossp-js pyv8 ) ) - -S=${WORKDIR}/${PN} - -PYLOAD_WORKDIR="/var/lib/pyload" # (/var/lib/ in lack of a better place) - -pkg_setup() { - python_pkg_setup - -# enewuser "pyload" -1 -1 "${PYLOAD_WORKDIR}" -} - -src_unpack() { - if [[ ${PV} == *9999 ]]; then - mercurial_src_unpack - else - default - #base_src_unpack - fi -} - -src_prepare() { - # fix pidfile - sed -i -e 's:self.pidfile = "pyload.pid":self.pidfile = "/var/run/pyload.pid":' ${S}/pyLoadCore.py - - # fix workdir - cat > ${S}/module/config/configdir <<-EOF - ${PYLOAD_WORKDIR} - EOF - - # replace some shipped dependencies with the system libraries - rm -r \ - ${S}/module/lib/BeautifulSoup.py \ - ${S}/module/lib/beaker \ - ${S}/module/lib/feedparser.py \ - ${S}/module/lib/simplejson - - find ${S}/module/ -name "*.py" -type f -print0 | xargs -0 \ - sed -i \ - -e 's:from module.lib.BeautifulSoup:from BeautifulSoup:' \ - -e 's:from module.lib \(import feedparser.*\):\1:' \ - -e 's:from module.lib.simplejson:from simplejson:' \ - #${S}/module/**/*.py # globbing not working -> find - - - if ! use qt4; then - rm -r ${S}/module/gui - fi -} - -src_configure() { - : -} - -src_compile() { - : -} - -src_install() { - insinto "/opt/${PN}" - doins -r ${S}/locale - doins -r ${S}/module - doins -r ${S}/scripts - doins ${S}/pyLoadCore.py - doins ${S}/pyLoadCli.py - - make_wrapper "pyloadcli" "/opt/${PN}/pyLoadCli.py" - - if use qt4; then - doins -r ${S}/icons - make_wrapper pyloadgui "/opt/${PN}/pyLoadGui.py" - fi - - dodir "${PYLOAD_WORKDIR}" - cp "${S}/module/config/default.conf" "${D}/${PYLOAD_WORKDIR}/pyload.conf" - #fix tmpdir - ln -sf "/tmp" "${D}/${PYLOAD_WORKDIR}/tmp" - - newinitd "${FILESDIR}/pyload" "pyload" - - if use systemd; then - systemd_dounit "${FILESDIR}/pyload.service" - fi -} - -pkg_postinst() { - if use ssl && ! test -f "${PYLOAD_WORKDIR}/ssl.key"; then - einfo "If you want to use pyLoad's XML-RPC via SSL have to create a key in pyloads work directory" - echo - einfo "cd ${PYLOAD_WORKDIR}" - einfo "openssl genrsa 1024 > ssl.key" - einfo "openssl req -new -key ssl.key -out ssl.csr" - einfo "openssl req -days 36500 -x509 -key ssl.key -in ssl.csr > ssl.crt" - fi -} diff --git a/net-misc/pyload/pyload-0.4.9.ebuild b/net-misc/pyload/pyload-0.4.9.ebuild index 988c7358bf4ff4f053da3aecd2c8aaeb4db7f6eb..e6b24aed24dc392a3147675b23e8a1a37bd7e9bc 100644 --- a/net-misc/pyload/pyload-0.4.9.ebuild +++ b/net-misc/pyload/pyload-0.4.9.ebuild @@ -9,20 +9,16 @@ PYTHON_USE_WITH="sqlite" inherit base eutils python systemd -if [[ ${PV} == *9999 ]]; then - EHG_REPO_URI="http://bitbucket.org/spoob/pyload/" - inherit mercurial -else - SRC_URI="http://get.pyload.org/static/${PN}-src-v${PV}.zip" - KEYWORDS="~amd64 ~x86" -fi +SRC_URI="http://get.pyload.org/static/${PN}-src-v${PV}.zip" +KEYWORDS="~amd64 ~x86" + DESCRIPTION="A fast, lightweight and full featured download manager for many One-Click-Hosters." HOMEPAGE="http://www.pyload.org" #Upstreams says GPL but part of the source is not available to users #We need a review about this and find the right license. LICENSE="freedist" SLOT="0" -IUSE="captcha clicknload container qt4 rar ssl systemd" +IUSE="captcha clicknload container qt4 rar ssl" DEPEND="app-arch/unzip" @@ -34,8 +30,8 @@ RDEPEND="${DEPEND} dev-python/pycurl dev-python/jinja captcha? ( - dev-python/imaging app-text/tesseract + virtual/python-imaging ) clicknload? ( || ( @@ -74,7 +70,9 @@ src_unpack() { } src_prepare() { - epatch "${FILESDIR}/${P}-sanitize-config.patch" + epatch "${FILESDIR}/${P}-sanitize-config.patch" \ + "${FILESDIR}/${P}-PIL.patch" + # replace some shipped dependencies with the system libraries rm -r \ ${S}/module/lib/BeautifulSoup.py \ @@ -94,11 +92,15 @@ src_prepare() { -e 's:import module:import pyload:' \ #${S}/module/**/*.py # globbing not working -> find - sed -i -e 's:from module:from pyload:' \ - -e 's:import module:import pyload:' pyLoadCore.py + sed -i \ + -e 's:from module:from pyload:' \ + -e 's:import module:import pyload:' \ + pyLoadCore.py - sed -i -e 's:from module:from pyload:' \ - -e 's:import module: import pyload:' pyLoadCli.py + sed -i \ + -e 's:from module:from pyload:' \ + -e 's:import module:import pyload:' \ + pyLoadCli.py if ! use qt4; then rm -r ${S}/module/gui @@ -114,12 +116,14 @@ src_compile() { } src_install() { - insinto $(python_get_sitedir)/${PN} + insinto $(python_get_sitedir)/${PN} doins -r ${S}/module/* + insinto /usr/share/${PN} doins -r ${S}/locale #doins -r ${S}/module doins -r ${S}/scripts + exeinto /usr/bin/ newexe ${S}/pyLoadCore.py pyLoadCore newexe ${S}/pyLoadCli.py pyLoadCli @@ -133,18 +137,17 @@ src_install() { dodir ${PYLOAD_WORKDIR} # install default config if ! test -f /etc/pyload/pyload.conf; then - cp ${FILESDIR}/default.conf ${D}/etc/pyload/pyload.conf + insinto /etc/pyload + newins "${S}/module/config/default.conf" pyload.conf fi #fix tmpdir dosym /tmp ${PYLOAD_WORKDIR}/tmp - newinitd ${FILESDIR}/pyload.init pyload + newinitd ${FILESDIR}/pyload.initd pyload newconfd ${FILESDIR}/pyload.confd pyload - if use systemd; then - systemd_dounit ${FILESDIR}/pyload.service - fi + systemd_dounit ${FILESDIR}/pyload.service python_convert_shebangs -q -r 2 "${D}" } @@ -155,7 +158,7 @@ pkg_postinst() { einfo "If you plan using pyLoad's XML-RPC via SSL, you'll have to create a key in pyloads work directory" echo einfo "For the lazy, the list of needed commands is:" - echo + echo einfo "cd ${PYLOAD_WORKDIR}" einfo "openssl genrsa 1024 > ssl.key" einfo "openssl req -new -key ssl.key -out ssl.csr"