summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Bronder <jsbronder@gentoo.org>2013-01-11 19:54:02 +0000
committerJustin Bronder <jsbronder@gentoo.org>2013-01-11 19:54:02 +0000
commit237c9e72784c1200914637dec091d668eef3422c (patch)
tree44eb577f9dca0e8ace7615ce3589cbb9ffb96daa /net-nntp
parentremove old versions (diff)
downloadhistorical-237c9e72784c1200914637dec091d668eef3422c.tar.gz
historical-237c9e72784c1200914637dec091d668eef3422c.tar.bz2
historical-237c9e72784c1200914637dec091d668eef3422c.zip
Wrap sabnzbd.py with either python2.7 or python2.6. Resolves #450698.
Package-Manager: portage-2.1.11.38/cvs/Linux x86_64 Manifest-Sign-Key: 0x4D7043C9
Diffstat (limited to 'net-nntp')
-rw-r--r--net-nntp/sabnzbd/ChangeLog5
-rw-r--r--net-nntp/sabnzbd/Manifest10
-rw-r--r--net-nntp/sabnzbd/files/sabnzbd13
3 files changed, 21 insertions, 7 deletions
diff --git a/net-nntp/sabnzbd/ChangeLog b/net-nntp/sabnzbd/ChangeLog
index 0e64d9b5fcff..56e7a1901100 100644
--- a/net-nntp/sabnzbd/ChangeLog
+++ b/net-nntp/sabnzbd/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-nntp/sabnzbd
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/ChangeLog,v 1.5 2013/01/07 01:06:28 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/sabnzbd/ChangeLog,v 1.6 2013/01/11 19:53:53 jsbronder Exp $
+
+ 11 Jan 2013; Justin Bronder <jsbronder@gentoo.org> files/sabnzbd:
+ Wrap sabnzbd.py with either python2.7 or python2.6. Resolves #450698.
07 Jan 2013; Zac Medico <zmedico@gentoo.org> Manifest:
Fix incorrect Manifest entry for SABnzbd-0.7.9-src.tar.gz.
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 1347860f840d..d0815755730e 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -1,7 +1,7 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX sabnzbd 57 SHA256 923c9ebd69763b0b8d1012b63113d8c48ce2e2a5a79f027064d09fe17738f86f SHA512 91839a8f85b2b95d86a196ed1e430210b8af75f2f203243ec9c279237f316a4c351d7809b548289becb3d7e438287ced0045a532b3b62fd0b1791da3b150d84c WHIRLPOOL d9a7e8049db9a4dac85912ed2d0cf9cc0d800ac663f21de0147aac65681c04b9581ebcfa182eed35df0faa47e050dc6153dabfbb70f93e04ed81ca6f69be85a1
+AUX sabnzbd 281 SHA256 1224cb0157838e6d104592abd24b85eba832e23fbb57badd55e6877fd1bad17e SHA512 d3f064261c978fa4159b41636278f289bf549e2d83161652bce94e7a5ed3d1efdc3427cfdd84784bfc973ade589079417890fb8ced6eb04bad06628fbe6db66a WHIRLPOOL 6ee14687ed0a2f8be7dc7af1dd9e5d21ee07ee1788f3f7440094df9e0b28791f809ff1f9296df4771d1b50a62f19481f48ec674778a448bbb73267152d332f63
AUX sabnzbd.confd 189 SHA256 684877bf6d36927b5e51a66c5f4bf539cdbb407d570ce4a35bdd309634bd5b11 SHA512 d62a867adca670d1679a2679b038bece85618083db4b7b3cc41bb86b389ce1e12f1d003499e93be94b1046228751f8424349847acc68e35165f0e64464c157c9 WHIRLPOOL 3ea13bbea28f4b78ad35f0efdfcaed44a2748e6b58bde5156feb643027a8adca7aaf42d55cbdcb08bdaa536fac90f429dfe361ef71e6f16716c6ac1f87c208a0
AUX sabnzbd.initd 1078 SHA256 422c4d7d7b90ed6308c530950f71770bf0d4a9eb0840b185bc23798763a8e9d8 SHA512 cce74b1a10dfa6b9a368c56e70f5f020a93eef8230b67395f95d2d951b088255b2347f9bbc4dd5284fc6c84ce4f2648c8fa439b5a763cf160924fbe74a26b4af WHIRLPOOL 07974b78d280d4127f882b09dea0cb7a96afbc87aca19b5cd3662586db5773bd30aa3bcca98884094838e6eefda536e4440a14052a290097d4002d49a066acb2
AUX use-system-configobj-and-feedparser.patch 1254 SHA256 39e01c79058f37257e6f873f0e2643631d0f7c207fad058f227cfd0833f9ca9a SHA512 c2cf92909bd171d63179e4c2cbedf3f61b26bde2944e455b9ca798dd11aca5cccb85830df9d2f5800e5a0757e5ca9b14c78a275a025838a9ade52b6219a0af27 WHIRLPOOL df4221e3322d7c48e338e6cc80ef207f1dddcdc477e2a428825d3bf9c37772c545b94bebabb86e507ecece19a6a20bfc34356f6114dad521d3ee6e75a88ba2f5
@@ -9,12 +9,12 @@ DIST SABnzbd-0.7.7-src.tar.gz 2263992 SHA256 8f972449e6033414ac5fe10d97b31ffdc49
DIST SABnzbd-0.7.9-src.tar.gz 2269872 SHA256 cabe3148f3ad45ddeb0229c89cb4013477f4ffd7c11e034c6bf6262a0f7b71ae SHA512 180bc6e9bf648f0d529800ae2a249a348da10cb6848bd2c29e29f5bbfc84af4e0d6e0ee1f3119ca0fa485f587be88ee464767474ddf5bb3f2535ec34f90bcb8d WHIRLPOOL cc9c4b3ca08dcb13621cd9aee35ee5642f6a8cc26b44e56e977bc970b286e64d10b310f60dc56fdad82491fd2fdbb8e7aade6b07c6703b2b00c2a4f97b76b5bc
EBUILD sabnzbd-0.7.7.ebuild 2698 SHA256 c5da5da88d34039e5f6dffde2699d9ecac26367667b92575ee8fc60865fdfdc8 SHA512 1fe7798981b7de897dbc9eb6e7d164cdbf1898a8a91f086a2e77c7efb7be52f7e304e9ab2efd45cd14847c813e3b0b1c70ca49a37cb61d92a97dbe6352f924b2 WHIRLPOOL 7a236daec42d6b7e0bf6060774fecea917f4e806824c56c29ce283d200b894d52f7d17b460f0dd7fe1d382c69a7561a8b43b651909e026bd62997ebc79dbd664
EBUILD sabnzbd-0.7.9.ebuild 2629 SHA256 6fe351ea3d63cab2446a9fcb6bee247c0b9b5a77834d8716511c49fddc012cb1 SHA512 ffeaa532321245b4613ec1bf8abefc713d47906f1267b0776011d448691033a5a8cb1558a9f0b7f037aa260f8a7520877b2c39ce897fdcb0556ae5da878a84e0 WHIRLPOOL dbe100d9544298e2e000be7caffa7e49adca98505229408c481ce50ab4c5a2b14137b33f3d5700ddc5bac7bdcf06b898f28275c87df18c797dce7067e8a9cfd1
-MISC ChangeLog 1095 SHA256 3a788a7cd3d2b6789a85f4a495f91003b8deb4d0910733f8219c6d4b596db4fe SHA512 12f2374cb08a128ec728f11a0e82721210f8c880c16a0dbbcd53199d612f9ec1fcb9a212e043e1129db3f407434764e30eb5e02a0eb693c15bfabc7ccf87d00a WHIRLPOOL 465bd69301faf03ddd0a6dff9e47d5ee0868aef3e99d19495852aaf83f25762d35e8110ddb3ff00c7cb5b25e79c3ca276d40e1aff9a284b24595687be8745e83
+MISC ChangeLog 1238 SHA256 ab64a3612d493226e96b6e688fa7e88f871d5d8af2f11d389e17257f7bfc5100 SHA512 a59e10924d93ffb795c7222bfe90ecf74857a742fddf036c30a6f0846461d782746e53f74275017b13f9af0be95f1027297f256cd4be5fe19d8e2605547b9853 WHIRLPOOL 5a582a0a6ea61886712f5b425a9f7e1c25c4d0a43df9b5d09dd6b465c74a13c78a54048c6070e24f9b9ca18019c561297c57eb372a621fa26a508897d93ff26b
MISC metadata.xml 484 SHA256 8e26c45345b47dbcdd018d9006a4d7f42a1394da6e39e9e968b1362480ae5d7a SHA512 18630bf4e3afa57977c1c4d7f562888c3048c3778a9aff4bba2e969f3f1934d8f85c22fef30c453f5ea09f410ce16761b75c25ba7d73ce1a14ea4abffcd918a6 WHIRLPOOL a399aa5a061fba0278117af2c8e18f88bb8cb10e049ff0cc9d86d9316497dcc5c13e55ceeea03b848ab4f796665e6efa0fc3345c02a4dcbbaacdef782ab7cc2b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlDqH5YACgkQ/ejvha5XGaNS8gCg1z0r4BK4dbN3BpEH2Vjb+pHs
-GccAniKDxIhJi9ZbtWhFLg25hYzFT29U
-=JfHl
+iEYEAREIAAYFAlDwbdYACgkQ4MrvBE1wQ8kV3QCgozyovMPqnnwsBHO68zrTs2Ow
+REgAniIV+zt9zpBQn3czje9qymN74Wou
+=wsXa
-----END PGP SIGNATURE-----
diff --git a/net-nntp/sabnzbd/files/sabnzbd b/net-nntp/sabnzbd/files/sabnzbd
index 33aaf7bcbc2a..ccc1a67fcf71 100644
--- a/net-nntp/sabnzbd/files/sabnzbd
+++ b/net-nntp/sabnzbd/files/sabnzbd
@@ -1,3 +1,14 @@
#!/bin/sh
-cd /usr/share/sabnzbd && python SABnzbd.py $*
+pyexe=python2.7
+
+if [ ! -x /usr/bin/${pyexe} ]; then
+ pyexe=python2.6
+fi
+
+if [ ! -x /usr/bin/${pyexe} ]; then
+ echo "No suitable python executable found in /usr/sbin (python2.6 || python2.7)"
+ exit 1
+fi
+
+cd /usr/share/sabnzbd && /usr/bin/${pyexe} SABnzbd.py $*