summaryrefslogtreecommitdiff
path: root/net-misc
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-01-13 06:19:51 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-01-13 06:19:51 +0000
commit8be70107efbb417f839292165ee39d07a062046f (patch)
tree013918887ec4a00f0cefdb4b4d1313cbc3054305 /net-misc
parent343a7272d559a21a0e0ed13cb743fabb2bfcc479 (diff)
gentoo resync : 13.01.2018
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/Manifest.gzbin61334 -> 61347 bytes
-rw-r--r--net-misc/curl/Manifest2
-rw-r--r--net-misc/curl/curl-7.57.0.ebuild2
-rw-r--r--net-misc/dropbear/Manifest2
-rw-r--r--net-misc/dropbear/dropbear-2017.75.ebuild98
-rw-r--r--net-misc/electrum/Manifest6
-rw-r--r--net-misc/electrum/electrum-2.7.15.ebuild168
-rw-r--r--net-misc/electrum/electrum-3.0.3.ebuild174
-rw-r--r--net-misc/electrum/electrum-3.0.5.ebuild2
-rw-r--r--net-misc/openssh/Manifest2
-rw-r--r--net-misc/openssh/openssh-7.5_p1-r3.ebuild4
-rw-r--r--net-misc/rsync/Manifest2
-rw-r--r--net-misc/rsync/rsync-3.1.2-r1.ebuild2
-rw-r--r--net-misc/seafile-client/Manifest2
-rw-r--r--net-misc/seafile-client/seafile-client-6.1.4.ebuild50
-rw-r--r--net-misc/seafile/Manifest2
-rw-r--r--net-misc/seafile/seafile-6.1.4.ebuild43
-rw-r--r--net-misc/unison/Manifest4
-rw-r--r--net-misc/unison/unison-2.48.3.ebuild81
-rw-r--r--net-misc/youtube-dl/Manifest4
-rw-r--r--net-misc/youtube-dl/youtube-dl-2018.01.07.ebuild (renamed from net-misc/youtube-dl/youtube-dl-2017.12.23.ebuild)15
21 files changed, 215 insertions, 450 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index dc2bdfca41cf..8460872eaf9c 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
Binary files differ
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index b39c196a3144..55d5a7bb05c3 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -3,5 +3,5 @@ AUX curl-7.55.1-fix-build.patch 604 BLAKE2B bf8967460ddab3f0626c93a48d345aa1451d
AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa
AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
DIST curl-7.57.0.tar.bz2 2849283 BLAKE2B 05bf62df8908a7c2b00abbc31067b8e12e8f8527594597e0c92e950a83e359e3ad430930face01057e0d2e6af8e8d759a9e078bd179cdbd69bc7fe2d10c5c5e3 SHA512 f366d2e931d7aff63bac0e1f760ced32c849252947d522427ba92124566906a7e6bd081b6d1630df36895dda2a00ac4cf1bed1470740693ef47ab90c6a270377
-EBUILD curl-7.57.0.ebuild 7185 BLAKE2B 54952d43501164092fe180abc4604e8919d1fb0f6466bc9ab2b2043b4ab38fe68ecd4fea9d924fea24f687b2548b55dfdb33803478e33f0a7fddeab261f5aad8 SHA512 603b5745fec1cb1eece68f579fdb3b19b83c9e1973e09a933e6a78ed90216ecb400e8a92ef9dc8420de6c08f9eebc5298e74ccd3fb578703f77521ec0c348aef
+EBUILD curl-7.57.0.ebuild 7181 BLAKE2B 6b64ba502ac4b586b689b42b90d009c682f1df867e1f0aaa2964c51f5b22b4bd1f8a6da5376d9b3858821708e7a257a2b190188aaf0de2f821d86a80c82cd853 SHA512 65a2058ee302123fc3d18551b68c8be5efa2640f621620084df6d27772e7bdfb6ad8dcc36acb46dfaf63c8f883e6c68933d35a471951ec587d509d6a2c4db9b8
MISC metadata.xml 837 BLAKE2B 1f3436d7a90c4807a7399367c051aa644604daa46f9090f3cf4b12b4159a5f34d566e660288da7849ec7e8a51661fc71109ae3370d1b87e41842ca3713f7f076 SHA512 27e75529e492f897705e249135c7ed661de04eef216fe62669fce544b8c318e44c5435b884fb8f206433293be894bbe1b6214b6cf1a394c9cb907dad48db00a0
diff --git a/net-misc/curl/curl-7.57.0.ebuild b/net-misc/curl/curl-7.57.0.ebuild
index b41e8b8dd991..e2b69c36295f 100644
--- a/net-misc/curl/curl-7.57.0.ebuild
+++ b/net-misc/curl/curl-7.57.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
IUSE+=" elibc_Winnt"
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index cad29cb849ca..dd8d770a0087 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -2,5 +2,7 @@ AUX dropbear-0.46-dbscp.patch 500 BLAKE2B 268b3a065ff9a9d52659c969195a712e8bfcbc
AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee7533ed3d39625f43580012591b2cf8dcc9ea5f093a64d3ed81fa590c44389bacb369b9123929ca2bb69 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f
AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8
DIST dropbear-2016.74.tar.bz2 1622234 BLAKE2B c729a2c1afd13e1ca07f3c9cfe3ff0ea7888cc1687ea2793275134b3224118164ef81583f55dbec53d6322be53eaa7a7324216133919722390d0e2dfbd929f07 SHA512 c0f4ea7840077b8302b48e27b5b588a4babac6583740dfdb845c40f633aa3ec96174d1d2ade81d2c3e23ea99b75e906312c512d8c7580e6e4105b2dbd37e5e22
+DIST dropbear-2017.75.tar.bz2 1623392 BLAKE2B c024037d3ebcb3f16aed2a5f24e07c06699a510b327a0ea528db7160ad2a8e554af2a233a266f869e0e30c78f3b0b7792a817d9c07f058f605dbf2dc749a4fda SHA512 9c2f2a5e718339f83abc0ad7719bda12bfc75e5bcb87a7c0eec0afefc743e5c0a1575d290d5fde152ff2100b0f0e6fd5ef4431f7bbcb5ca9a332d93c20f5a8f4
EBUILD dropbear-2016.74.ebuild 2476 BLAKE2B 41d21f7aecf0d056a63ab5150af700d2fd36659dd25f29dc67cbb7acf852ee4e583b5ef1c7f2c74710d5409988ed91a4e3eecb2e9821911cf5a8c67cfef41795 SHA512 a1bf33919cce4fab7c1b23dac884db81883555eb9c249f30e5ff96cc856375e3849b18350a52abf7e78bcb3fc12418ad2d86508cd396562230cb155fb15f9420
+EBUILD dropbear-2017.75.ebuild 2489 BLAKE2B 2094e7d2f7b618a069cbf60cefe44da2a28c20fd89e97adad8f3c064c7b45f84a1167e434742d2867816640c4807fa2752b2412ac86227cd1d6a4432d392fd34 SHA512 10ebe3595920705fbedd1e79a10f6ca0a804e92feb9ec37e82a4666934e9b04fa6d6b7c154adebbb78339a4e82af120aecbfa7d655beda33b46384faa07da0bf
MISC metadata.xml 1791 BLAKE2B d5816e2173f3fe0177562b1ef7e36c6ec56c4d596c27231f02eaedd41eba091abcff7cb0e0114d5431d735b011fcaaabf01e5e70ff61478c669232243bc7e244 SHA512 1f99332f1f194f989838dc5c04fa1c7661e13da3efa7b98fa6392ab3c3e6887a4a9c7319fdb43f102b2fb3cbc0ee70e79792b595c2f49d2bbf4e50be3f362314
diff --git a/net-misc/dropbear/dropbear-2017.75.ebuild b/net-misc/dropbear/dropbear-2017.75.ebuild
new file mode 100644
index 000000000000..44611e4e4595
--- /dev/null
+++ b/net-misc/dropbear/dropbear-2017.75.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils savedconfig pam user
+
+DESCRIPTION="small SSH 2 client/server designed for small memory environments"
+HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
+SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
+ http://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="bsdpty minimal multicall pam +shadow static +syslog zlib"
+
+LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )
+ dev-libs/libtommath[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+ pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )"
+RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
+
+REQUIRED_USE="pam? ( !static )"
+
+set_options() {
+ progs=(
+ dropbear dbclient dropbearkey
+ $(usex minimal "" "dropbearconvert scp")
+ )
+ makeopts=(
+ MULTI=$(usex multicall 1 0)
+ STATIC=$(usex static 1 0)
+ )
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.46-dbscp.patch
+ sed -i \
+ -e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
+ options.h || die
+ sed -i \
+ -e '/pam_start/s:sshd:dropbear:' \
+ svr-authpam.c || die
+ restore_config options.h
+}
+
+src_configure() {
+ # XXX: Need to add libtomcrypt to the tree and re-enable this.
+ # --disable-bundled-libtom
+ econf \
+ $(use_enable zlib) \
+ $(use_enable pam) \
+ $(use_enable !bsdpty openpty) \
+ $(use_enable shadow) \
+ $(use_enable syslog)
+}
+
+src_compile() {
+ set_options
+ emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
+}
+
+src_install() {
+ set_options
+ emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
+ doman *.8
+ newinitd "${FILESDIR}"/dropbear.init.d dropbear
+ newconfd "${FILESDIR}"/dropbear.conf.d dropbear
+ dodoc CHANGES README TODO SMALL MULTI
+
+ # The multi install target does not install the links right.
+ if use multicall ; then
+ cd "${ED}"/usr/bin
+ local x
+ for x in "${progs[@]}" ; do
+ ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
+ done
+ rm -f dropbear
+ dodir /usr/sbin
+ dosym ../bin/dropbearmulti /usr/sbin/dropbear
+ cd "${S}"
+ fi
+ save_config options.h
+
+ if ! use minimal ; then
+ mv "${ED}"/usr/bin/{,db}scp || die
+ fi
+
+ pamd_mimic system-remote-login dropbear auth account password session
+}
+
+pkg_preinst() {
+ enewgroup sshd 22
+ enewuser sshd 22 -1 /var/empty sshd
+}
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 3e2204080fdb..1c99c0e15994 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,9 +1,5 @@
AUX 2.7.15-no-user-root.patch 704 BLAKE2B d7353f8338be379cd31f42cc29c4346930c191b3157084df658eebc0d1e4202d9711d8694b6b6ba65285f0de1e83ab55188d9d79a2e6a45c919c1dcb64003b91 SHA512 3bce2f6b0605e708107097b8bb033681c901afc535c1921712d3b2db172cc296b50cc4a833b0d21c9718fc094d37d9d9b3c2e9abb65d6f96449ae91635d3101c
AUX 2.8.0-no-user-root.patch 708 BLAKE2B fe16be6af4322f52a5014acf034ad4f8e2711c46386de9ccbeedee819224d8523ecd79c862338de1910f84a5c39cddbffce9955c2c0185576d837f2d2ac08da6 SHA512 d5e75f6b4dad401b547d4533126b93690c17237c51987547639c407fe684f5fe83759ea77637b8b2e7b2b9c63ac85ff015ec2b35c459bbef74572ea08f89c8dd
-DIST Electrum-2.7.15.tar.gz 1967697 BLAKE2B 94a189fb1b950dc2691cfa92143d68052f615e534fb9d3d7feed92a39bb717199b227d0e265715e86c3ed9b8ccd743fa77f2691dfc5b47073b03f80152185565 SHA512 2f4f5181dcf0b98ce34348c296e50383b677db1fd14fa0052a0168a7c880d18d04ebb9a91dbb7316e09adeda275cc87b5457c8f0925b3635a1c769c81f31165c
-DIST Electrum-3.0.3.tar.gz 2590410 BLAKE2B 676422bc14ce597a2b4903ea4d7e3dcec1bd23424d678aa1c248e824a1656a60afaef284c8ba22242da3cfdbe4421dba04f4aeef42ca507043988067a340d0b9 SHA512 6628b6621e3502bb9782ec7ce0fd11a657c10dfaab6a5c4de4e4bae5bc1207fa55f642a92fcca08e1f342e0ecf8dd0c72134db7020e03df2ed6f81b27c49aa30
DIST Electrum-3.0.5.tar.gz 2639766 BLAKE2B 28587ca056247a5671d84c0b79824e8eea8df8ca2e3204333e6edd7db98ecbeebdf81f4ac819de8b87c7593e83f948d091d48d55cdff08af76322d94bacec0fd SHA512 27cfa44ce8eeb5eef8038f1f68b4a42d173daaf7a940ffc9e9b1dad16a8f7f49bd53d5eefdbaf242e5e09aa2f887bce536f17941c2250225cd92c78f62c52e39
-EBUILD electrum-2.7.15.ebuild 4097 BLAKE2B 47368e67b82f77c16a37492dc766695cbdc8da78e98052262a9213febcad4b6ed5d958b126566f118951b1b4fc26f37874052417d5fa92cb16000b37e24fadeb SHA512 1a147ff600c857c1b4743d19b4bfdab6d474d2d31a0b97b6f4692ed639514cb8965200c41e5e6666eb119e3f7af35f6d47aeb4408489d4ef83929ceaa433ad8f
-EBUILD electrum-3.0.3.ebuild 4258 BLAKE2B 322b1ae7d0ee7b936b70ec9a476470e2e9dc713a1115b7a4b2e9a7d23e484fa24a3ea85cab25b64bf6d734c3b17b96cbcf84f3013cbe8fbae364982ed80e26d5 SHA512 442cecdaedf04d2af3fab57a5144e15b7ed13681ab6181326a257cd0415f6335d09d61acc24155d0f2b67a19678e5ea6b69a59a81a5a48a67c81005bf0f4761f
-EBUILD electrum-3.0.5.ebuild 4258 BLAKE2B 322b1ae7d0ee7b936b70ec9a476470e2e9dc713a1115b7a4b2e9a7d23e484fa24a3ea85cab25b64bf6d734c3b17b96cbcf84f3013cbe8fbae364982ed80e26d5 SHA512 442cecdaedf04d2af3fab57a5144e15b7ed13681ab6181326a257cd0415f6335d09d61acc24155d0f2b67a19678e5ea6b69a59a81a5a48a67c81005bf0f4761f
+EBUILD electrum-3.0.5.ebuild 4256 BLAKE2B 6f8b98f75accac0d16401175ec13acbe355ae328b69b06a04d0e55e0ccfa95c34d4804a8239bed611188af59c54a346077701defd827aed4b525ee42ad2628d4 SHA512 09d6270945126e63ea0c8385ec4fb4726d7b029e12543fcf6466c1384bebb38ab87d5462e926f1928971423099cb49fa0cb9433c52b4230fff474eb29750a877
MISC metadata.xml 1327 BLAKE2B d0029a93d9b105b621b2053498ff5c570e97e3945fb1c33252f85ab3110d06395b03d05b2625dc278ca8c36521762c74d52fcb9317055f9532e82c18168fb02e SHA512 3047791e1985494eeec1348c64e9a7ef6f9055cc01b0eb462dcb8958a6fb448d75ace206c33498cdd45a5470efc4091f5bc0bc062284a2bd2b0f4a6299591d09
diff --git a/net-misc/electrum/electrum-2.7.15.ebuild b/net-misc/electrum/electrum-2.7.15.ebuild
deleted file mode 100644
index ef6c1839e594..000000000000
--- a/net-misc/electrum/electrum-2.7.15.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses?"
-
-inherit distutils-r1 gnome2-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR vi_VN zh_CN"
-
-my_langs_to_l10n() {
- # Map all except pt_* and zh_* to their generic codes
- case $1 in
- pt_*|zh_*) echo ${1/_/-} ;;
- *) echo ${1%%_*} ;;
- esac
-}
-
-IUSE="cli cosign email greenaddress_it ncurses qrcode +qt4 sync trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
- IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
- || ( cli ncurses qt4 )
- cosign? ( qt4 )
- email? ( qt4 )
- greenaddress_it? ( qt4 )
- qrcode? ( qt4 )
- sync? ( qt4 )
- trustedcoin_com? ( qt4 )
- vkb? ( qt4 )
-"
-
-RDEPEND="
- dev-python/ecdsa[${PYTHON_USEDEP}]
- dev-python/jsonrpclib[${PYTHON_USEDEP}]
- dev-python/pbkdf2[${PYTHON_USEDEP}]
- dev-python/PySocks[${PYTHON_USEDEP}]
- dev-python/qrcode[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/slowaes[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/tlslite[${PYTHON_USEDEP}]
- || (
- dev-python/protobuf-python[${PYTHON_USEDEP}]
- dev-libs/protobuf[python,${PYTHON_USEDEP}]
- )
- virtual/python-dnspython[${PYTHON_USEDEP}]
- qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] )
- qt4? (
- dev-python/PyQt4[X,${PYTHON_USEDEP}]
- )
- ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
- epatch "${FILESDIR}/${PV}-no-user-root.patch"
-
- # Don't advise using PIP
- sed -i "s/On Linux, try 'sudo pip install zbar'/Re-emerge Electrum with the qrcode USE flag/" lib/qrscanner.py || die
-
- # Prevent icon from being installed in the wrong location
- sed -i '/icons/d' setup.py || die
-
- # Remove unrequested localization files:
- local lang
- for lang in ${MY_LANGS}; do
- use l10n_$(my_langs_to_l10n ${lang}) && continue
- rm -r "lib/locale/${lang}" || die
- done
-
- local wordlist=
- for wordlist in \
- $(usex l10n_ja '' japanese) \
- $(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
- $(usex l10n_es '' spanish) \
- $(usex l10n_zh-CN '' chinese_simplified) \
- ; do
- rm -f "lib/wordlist/${wordlist}.txt" || die
- sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
- done
-
- # Remove unrequested GUI implementations:
- local gui setup_py_gui
- for gui in \
- $(usex cli '' stdio) \
- kivy \
- $(usex qt4 '' qt ) \
- $(usex ncurses '' text ) \
- ; do
- rm gui/"${gui}"* -r || die
- done
-
- # And install requested ones...
- for gui in \
- $(usex qt4 qt '') \
- ; do
- setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
- done
-
- sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
- local bestgui
- if use qt4; then
- bestgui=qt
- elif use ncurses; then
- bestgui=text
- else
- bestgui=stdio
- fi
- sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
-
- local plugin
- # trezor requires python trezorlib module
- # keepkey requires trezor
- for plugin in \
- $(usex cosign '' cosigner_pool ) \
- hw_wallet \
- ledger \
- $(usex email '' email_requests ) \
- $(usex greenaddress_it '' greenaddress_instant) \
- keepkey \
- $(usex sync '' labels ) \
- trezor \
- $(usex trustedcoin_com '' trustedcoin ) \
- $(usex vkb '' virtualkeyboard ) \
- ; do
- rm -r plugins/"${plugin}"* || die
- sed -i "/${plugin}/d" setup.py || die
- done
-
- distutils-r1_src_prepare
-}
-
-src_install() {
- doicon -s 128 icons/${PN}.png
- distutils-r1_src_install
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/net-misc/electrum/electrum-3.0.3.ebuild b/net-misc/electrum/electrum-3.0.3.ebuild
deleted file mode 100644
index 2b62832e8ba6..000000000000
--- a/net-misc/electrum/electrum-3.0.3.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit distutils-r1 gnome2-utils xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
-
-my_langs_to_l10n() {
- # Map all except pt_* and zh_* to their generic codes
- case $1 in
- pt_*|zh_*) echo ${1/_/-} ;;
- *) echo ${1%%_*} ;;
- esac
-}
-
-IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
- IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
- || ( cli ncurses qt5 )
- audio_modem? ( qt5 )
- cosign? ( qt5 )
- digitalbitbox? ( qt5 )
- email? ( qt5 )
- greenaddress_it? ( qt5 )
- qrcode? ( qt5 )
- sync? ( qt5 )
- trustedcoin_com? ( qt5 )
- vkb? ( qt5 )
-"
-
-RDEPEND="
- dev-python/ecdsa[${PYTHON_USEDEP}]
- dev-python/jsonrpclib[${PYTHON_USEDEP}]
- dev-python/pbkdf2[${PYTHON_USEDEP}]
- dev-python/pyaes[${PYTHON_USEDEP}]
- dev-python/PySocks[${PYTHON_USEDEP}]
- dev-python/qrcode[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/tlslite[${PYTHON_USEDEP}]
- || (
- dev-python/protobuf-python[${PYTHON_USEDEP}]
- dev-libs/protobuf[python,${PYTHON_USEDEP}]
- )
- virtual/python-dnspython[${PYTHON_USEDEP}]
- qrcode? ( media-gfx/zbar[v4l] )
- qt5? (
- dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
- )
- ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
- eapply "${FILESDIR}/2.8.0-no-user-root.patch"
-
- # Prevent icon from being installed in the wrong location
- sed -i '/icons/d' setup.py || die
-
- # Remove unrequested localization files:
- local lang
- for lang in ${MY_LANGS}; do
- use l10n_$(my_langs_to_l10n ${lang}) && continue
- rm -r "lib/locale/${lang}" || die
- done
-
- local wordlist=
- for wordlist in \
- $(usex l10n_ja '' japanese) \
- $(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
- $(usex l10n_es '' spanish) \
- $(usex l10n_zh-CN '' chinese_simplified) \
- ; do
- rm -f "lib/wordlist/${wordlist}.txt" || die
- sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
- done
-
- # Remove unrequested GUI implementations:
- local gui setup_py_gui
- for gui in \
- $(usex cli '' stdio) \
- kivy \
- $(usex qt5 '' qt ) \
- $(usex ncurses '' text ) \
- ; do
- rm gui/"${gui}"* -r || die
- done
-
- # And install requested ones...
- for gui in \
- $(usex qt5 qt '') \
- ; do
- setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
- done
-
- sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
- local bestgui
- if use qt5; then
- bestgui=qt
- elif use ncurses; then
- bestgui=text
- else
- bestgui=stdio
- fi
- sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
-
- local plugin
- # trezor requires python trezorlib module
- # keepkey requires trezor
- for plugin in \
- $(usex audio_modem '' audio_modem ) \
- $(usex cosign '' cosigner_pool ) \
- $(usex digitalbitbox '' digitalbitbox ) \
- $(usex email '' email_requests ) \
- $(usex greenaddress_it '' greenaddress_instant ) \
- hw_wallet \
- ledger \
- keepkey \
- $(usex sync '' labels ) \
- revealer \
- trezor \
- $(usex trustedcoin_com '' trustedcoin ) \
- $(usex vkb '' virtualkeyboard ) \
- ; do
- rm -r plugins/"${plugin}"* || die
- sed -i "/${plugin}/d" setup.py || die
- done
-
- eapply_user
-
- distutils-r1_src_prepare
-}
-
-src_install() {
- doicon -s 128 icons/${PN}.png
- distutils-r1_src_install
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-3.0.5.ebuild b/net-misc/electrum/electrum-3.0.5.ebuild
index 2b62832e8ba6..47ccf45aef4d 100644
--- a/net-misc/electrum/electrum-3.0.5.ebuild
+++ b/net-misc/electrum/electrum-3.0.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
my_langs_to_l10n() {
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index b4a02f11b122..3868fb040023 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -25,7 +25,7 @@ DIST openssh-7.6p1-hpnssh14v12.tar.xz 15392 BLAKE2B 6888ea4054a470116b2ab3d115f5
DIST openssh-7.6p1.tar.gz 1489788 BLAKE2B 938bfeeff0a0aaa2fc7e4c345f04561c6c071c526e354a7d344a08742cb70ab1f4a41d325b31720f2fba5c4afa4db11f3fc87055c8c9c8bea37b29cc11dc8f39 SHA512 de17fdcb8239401f76740c8d689a8761802f6df94e68d953f3c70b9f4f8bdb403617c48c1d01cc8c368d88e9d50aee540bf03d5a36687dfb39dfd28d73029d72
DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b
DIST openssh-lpk-7.6p1-0.3.14.patch.xz 17044 BLAKE2B a31dcb15848d3a22306108a4e181b1d52b195e6adcd2a78d5c7bf57f33c8ed62c3affa434c8d31c07eae84b59f1a3968a3f2a92e702f9225b121127616cb9d61 SHA512 e9a2b18fd6a58354198b6e48199059d055451a5f09c99bf7293d0d54137a59c581a9cb3bd906f31589e03d8450fb017b9015e18c67b7b6ae840e336039436974
-EBUILD openssh-7.5_p1-r3.ebuild 11069 BLAKE2B 0efa1ef57d36fa9f0065f47e6fb5eecf1a15d860123232df4e6c6d5ac2a9539e3698b31b055219f35cd1104485db9befe120395db87fdfd31f9fa8d715b4243e SHA512 9ff09f013015a94c2c47ac8e4206b3039eea861b4c5597fdc4fe4766081057e337ca121a7b32456f4ac842a5ffcbb3a8246c2710aaa68c195a8fe4b39c4f4a1d
+EBUILD openssh-7.5_p1-r3.ebuild 11127 BLAKE2B aed57a04ffa504758827af9269c747617598677fc3ec2a2c587b559f7874b9f1d0a0269a32ff7fe4fb454271f62cc7931a68bf537db9bee4e4cdf7925d040046 SHA512 2fb7096c8b6a44d9abd89c8312d506a5ce711a7be049d1fc227d155fc80e138b1118110c9f5491d92a1ebda310207d75eaf80069d122ea4d4dde4002fa96b66c
EBUILD openssh-7.6_p1-r1.ebuild 11184 BLAKE2B c864783cdb2798c4b51986f08ab959117e57965f60a6d718caf508928a154344b5e2934db619dab7fc698b7c1411b8b79db01bb4076246662db5b1d034ffab58 SHA512 5ee9beacb3acf9d9b195e02ab10b390432ada244fb4c9e97a0cb1f04a8fe902c6816e0e1a6807bce8401c9827bc220a508fcdfd6650d43885a4e699c08e30884
EBUILD openssh-7.6_p1.ebuild 11183 BLAKE2B 1d83808228655f59f0c44f65c6b61901f1b650b59447e15382c72e5477238d0fda4a669f8982afb295604e4a72e71fb7eed98d373e4ea6403c1cc585024ef9b5 SHA512 3b779a728ab8f1b0f8d2973be0c2534c0572b33b17f4e51e407c92502d33c23eece1e35ea118aa374422f8a8c5aea27adf86f863f19c01f199981b639146046d
MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/openssh-7.5_p1-r3.ebuild b/net-misc/openssh/openssh-7.5_p1-r3.ebuild
index 1f173bc6211f..a3c62aa567f5 100644
--- a/net-misc/openssh/openssh-7.5_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-7.5_p1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -132,7 +132,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch
epatch "${FILESDIR}"/${PN}-7.5_p1-CVE-2017-15906.patch
- epatch "${FILESDIR}"/${PN}-7.5_p1-s390-seccomp.patch
+ use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-s390-seccomp.patch # already included in X509 patch set, #644252
use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*}
use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch
use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 20c128492971..a75b89f6be56 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -10,7 +10,7 @@ AUX rsyncd.logrotate 105 BLAKE2B 82430036a5ca123ba20bc80040e98869734b3b397440968
AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99acefb38c16b8ae9430a5257440c070b88b71a1295cc6360d89458e1b6696ec9897e722699f162769e SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625
AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
DIST rsync-3.1.2.tar.gz 892724 BLAKE2B e366514ae9835ba7c201a9e09fb9342c5e52fa36d45d46300d080403de25a64ba3ed7a703e56b4f47a743a597694a2d0a50bb4bab6cfa0aa7b59a4f7b93b9f21 SHA512 4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b
-EBUILD rsync-3.1.2-r1.ebuild 2869 BLAKE2B 039b1290b3e5ae9ea76f2d0ae1f8a7f31cb5044a456feeac3a81f450ef6482a145d98b3b9ba611baee40de96fdd266b09ade4a010d5f1aa4769f3add743f3bf2 SHA512 3ebd1ea8837837474c7bd3a791e4b9961470cb52eef482ea2c0b19250bfac98f7b92467299f3c415a56ff5575aef7d9939d09b5b7ad6cf4d461d6ae2a9fb643b
+EBUILD rsync-3.1.2-r1.ebuild 2868 BLAKE2B 43895a478b5e451a202c61a9103f0bc0b66c067e8dc52fdb868b7149c651cc85cccd8b2b5564e87097becad079ee806361b4cca53456ab46c09d219b900be589 SHA512 4c0311a250f2ad01016918b0b0c5bd4eaa09953d913e9ee66da53b081d7941312903d3b068ec48710f5ead6f659b0315fe422c729277650c34238106c8afac4a
EBUILD rsync-3.1.2-r2.ebuild 3080 BLAKE2B a78563994b1bcefa55bb71b3ecd66224be4f6d46177f80fcb3597bcfa0944313b7aa4a37c05ee1801a5fca293978cd8fc51c15a8d4b0da2aa9c2d6c32498a605 SHA512 1627518be854536ba26be38dd98cfb2f563ff855625742cbcd6d401252d42f17e2830188dd2de6de3e07404979de922a63b69bb71874773b7cb36c92014a327f
EBUILD rsync-3.1.2.ebuild 2840 BLAKE2B 2ee399fcfa6ed8b11b2446178653d3ae55a4bd2f920f4ca5430f397741f9161ce6ccfd472030e7f008225fa28f9886d92751767be5b2213a5f0706207f9c448a SHA512 2f0998787e96cfbb29398923998905fc029520a1352ae4420561471f8342e3876e0ed9dec935d4d5677bed2693aa6aa810b7f713914633ba97676a2dfa1edcb1
MISC metadata.xml 449 BLAKE2B 961dae7e8c69c0d452c9eedf67223d14ff8ff481821206d6fe2daed3a23a0da704155d61339b0d32182e5ba9195ff25b3383bd90945ea474b21da7f66f09c77f SHA512 1c0f031c078a7c22b8375b093dcd241e139ca86a61e2d463d9d01946b57b24dff29ab489ac063b70d210d1306106896fe77bd9678331d5954ef3182222d4f920
diff --git a/net-misc/rsync/rsync-3.1.2-r1.ebuild b/net-misc/rsync/rsync-3.1.2-r1.ebuild
index 4778a67feccb..84bd042e0aae 100644
--- a/net-misc/rsync/rsync-3.1.2-r1.ebuild
+++ b/net-misc/rsync/rsync-3.1.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
if [[ ${PV} != *_pre ]] ; then
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
IUSE="acl examples iconv ipv6 static stunnel xattr"
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index 99a2c41c21ac..fe027afbd473 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -2,7 +2,9 @@ AUX seafile-client-select-qt5.patch 807 BLAKE2B bc28c24a114899fa4d864a3ea10d1d2a
DIST seafile-client-6.0.7.tar.gz 2192384 BLAKE2B 89bd8821b2b5a10ddb94d48ea43f796622acab24db7982ae7006c32117f4dd4fe63839643c308e3e1dc97c47be813248ae3164caded4c1551fed3f86aa6dd83f SHA512 4baa15d454a9c937c9ae944b2bcc6b549fc41a1558e40578a273497ccb120a9131580f2b5db047ce6d7e0503105bd0fa5312e823ab475241fb07f5ba0021224f
DIST seafile-client-6.1.0.tar.gz 2246388 BLAKE2B f57e89e9ae9364e8712e2f3a464cf2204b72a3ed141a7562a54c5c6f678497053b37ba64ca3de84e114a596a76fd1391ee8f98574627536abf8aee5271c7c154 SHA512 c6e3191afcaa833876c24690566be36ccc94e7a333c94f78df9201f23a3eed37397641e237e63b70cdc413ed6dc5683737d2eefa5c2c628b5e207bef1176b0d5
DIST seafile-client-6.1.3.tar.gz 2358459 BLAKE2B 75bd2a98de25c135060e5c14ac984a98dc0d6da903b675cc456b1bb52475c5a60a2c2b78be5665aa80a4c05d3fc8f2cf5e016e28ba25feb8e957a1d8d9d93ad1 SHA512 be5426ef472ac7e788e164f601c4c2b2ca91e305b15dac7eddf9874af5639141bf845e36c5385c4af1d2f6df4c7af6554497bd107cbccb35f8c904694705497d
+DIST seafile-client-6.1.4.tar.gz 2210086 BLAKE2B 35b118c28ab8cc011e6ebf6ff7532f7078d4acb7251e7cfadf3e1b4e7d4507b09f5beefca1fdb2ba9daafcb118981af743b80698662cf4ed73b15781c0282c87 SHA512 582b630d6da28c06ef8c3841268d3e8cbfd7dbd8fc8f78fb77e20d86f6fb97ee72f5a1cac722cd1cb5874d9ad6e687e4d03097971230f92c90ce6b02da90c243
EBUILD seafile-client-6.0.7.ebuild 1244 BLAKE2B 4f357fa335b147a3cd78ec018736a86d51eb86c2fa0b170d9f7820d698831caa5df8beb531d14e8aead6341d71700cb678b07587e8cad64bf41057c56e3bea97 SHA512 e85ebb350d51f3f83fe2720f1c905e8943055f5298cb83a8b050422ef42823d20be6daae242c1c8178a0fb4fa81c26688cd719358ca8da040a000633cca8968b
EBUILD seafile-client-6.1.0.ebuild 1244 BLAKE2B 4f357fa335b147a3cd78ec018736a86d51eb86c2fa0b170d9f7820d698831caa5df8beb531d14e8aead6341d71700cb678b07587e8cad64bf41057c56e3bea97 SHA512 e85ebb350d51f3f83fe2720f1c905e8943055f5298cb83a8b050422ef42823d20be6daae242c1c8178a0fb4fa81c26688cd719358ca8da040a000633cca8968b
EBUILD seafile-client-6.1.3.ebuild 1244 BLAKE2B 4f357fa335b147a3cd78ec018736a86d51eb86c2fa0b170d9f7820d698831caa5df8beb531d14e8aead6341d71700cb678b07587e8cad64bf41057c56e3bea97 SHA512 e85ebb350d51f3f83fe2720f1c905e8943055f5298cb83a8b050422ef42823d20be6daae242c1c8178a0fb4fa81c26688cd719358ca8da040a000633cca8968b
+EBUILD seafile-client-6.1.4.ebuild 1244 BLAKE2B 4f357fa335b147a3cd78ec018736a86d51eb86c2fa0b170d9f7820d698831caa5df8beb531d14e8aead6341d71700cb678b07587e8cad64bf41057c56e3bea97 SHA512 e85ebb350d51f3f83fe2720f1c905e8943055f5298cb83a8b050422ef42823d20be6daae242c1c8178a0fb4fa81c26688cd719358ca8da040a000633cca8968b
MISC metadata.xml 515 BLAKE2B 3392b5f9ca2c3ad648b045eb8896f417fdab9ab8591b11fe1634272f0738fb5114b22a1b46bf5c618de53d6d7594ba748682210201b9843a55a52b1d37ff2a99 SHA512 80554cfef46d79142fa4a00b3f84ea3ba55ddad45d9b0bb08f76302581e9268f51e16e7ac20de15241fdf1d8765fc515c49a41a14bedea0dae3844e7f7f4ecb6
diff --git a/net-misc/seafile-client/seafile-client-6.1.4.ebuild b/net-misc/seafile-client/seafile-client-6.1.4.ebuild
new file mode 100644
index 000000000000..69b7bcb82bb7
--- /dev/null
+++ b/net-misc/seafile-client/seafile-client-6.1.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="Seafile desktop client"
+HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="shibboleth test"
+
+RDEPEND="net-libs/libsearpc
+ =net-libs/ccnet-${PV}
+ =net-misc/seafile-${PV}
+ >=dev-libs/libevent-2.0
+ >=dev-libs/jansson-2.0
+ dev-libs/openssl:0=
+ dev-db/sqlite:3
+
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtdbus:5
+ shibboleth? ( || ( dev-qt/qtwebengine:5[widgets] dev-qt/qtwebkit:5 ) )"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+ test? ( dev-qt/qttest:5 )"
+
+src_prepare() {
+ eapply "${FILESDIR}/${PN}-select-qt5.patch"
+ cmake-utils_src_prepare
+ if use shibboleth ; then
+ if ! has_version "dev-qt/qtwebengine:5[widgets]" ; then
+ sed -i -e 's/IF(WIN32 OR DETECTED_QT_VERSION VERSION_LESS 5.6.0)/IF(TRUE)/' CMakeLists.txt || die
+ fi
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
+ -DBUILD_TESTING="$(usex test)"
+ )
+ cmake-utils_src_configure
+}
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index a9483ab0bbe0..54b8a899c3c7 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -1,7 +1,9 @@
DIST seafile-6.0.7.tar.gz 823384 BLAKE2B eedb4e4333d01bc6e5a7d18bc0035aa921a00d2c2fadc151dc34971dbb0191c7220607e91422a5b75d957f037d90aa814faffdf3f7cd4dbc5bee5d17a49c1c92 SHA512 ec33fbb6b925d4be9b89140d75287115e09f570654946aff994eb50d2ca46e233005b8e0e917682822806d0b5fd70cb9b8a728bb0fd09d124adaadaf3efc849a
DIST seafile-6.1.0.tar.gz 823289 BLAKE2B 446606192eac43b5c0b56a322452e0573b1f9f80d66167fa67a99dc236f0e7f2d8d167129a01f70d138208afca467779ffab6f911f7f0bc99a4c730c0181c3ba SHA512 ccf2c66288093da7a00c24d019a1d765c6072485584d045b0d7acec4faee3448f52448113976eaf63950b1feda2c08d8ebda274f3178ca8ca6c643a822dde3fa
DIST seafile-6.1.3.tar.gz 823078 BLAKE2B 320f237db2d4c6f1bc7928627c404a1fcdc55a381d62a572e31a086e06abc35cae6ae848d28771e0882911a51477322436c8da58fc7948af201f731ea88b27c7 SHA512 c8c046952d5c8910f0ba444cdcaa2659260d328ba6449099777850e7d04f494186c56a2fd00e43fd20372c817d977e1a2fe36be040521ca92742c48d83d0b777
+DIST seafile-6.1.4.tar.gz 824276 BLAKE2B c21d01640128d52a9ee0ff05454107d84535942d5f5117de507e1898367fb9cd6adcaa15054a86ca3abbf9f5e69810cf26ac75d9f12b1439811d88aa5b87603f SHA512 5efcb3122877f9091f76b0946ba66104baf626bc1be9bc0eb980e26aa07ffdbe5ee74ea6780043796603d0f2bfe7ea2800718085acdae6f07268275a8f54269f
EBUILD seafile-6.0.7.ebuild 955 BLAKE2B 53f8c76e2b79df08a64fc82b0fbd347c924e8e71b546ed749e8b1d56173f7497dc3555cbe7df59b92b30118a32ad27598e6aad3325909090d1eec94da01e7057 SHA512 57e1abde70f6f9c75070d206c49975ee2433cb7318c266a5e5e42732deb29b47b3c3b9d0f2cc61da192820a397540220e3a538169fb48d869ab86b7f7c4321ba
EBUILD seafile-6.1.0.ebuild 955 BLAKE2B 53f8c76e2b79df08a64fc82b0fbd347c924e8e71b546ed749e8b1d56173f7497dc3555cbe7df59b92b30118a32ad27598e6aad3325909090d1eec94da01e7057 SHA512 57e1abde70f6f9c75070d206c49975ee2433cb7318c266a5e5e42732deb29b47b3c3b9d0f2cc61da192820a397540220e3a538169fb48d869ab86b7f7c4321ba
EBUILD seafile-6.1.3.ebuild 1126 BLAKE2B 91321048dba6b1de7317e93cb57976d4c808e2ed5216a3cad08518e53612360ec567b2055a63a34dfd0d56e95c105750d27f3912a3d90c76e7fa214086234e9b SHA512 c8f564ca319459320d0059e81e94e728aef02e92f5d780a0f63928dcb845aaf53f93d0d05af6e9b8950390d65ed341c7f1e1760d2eaa2b9c7e0a0df59edb7947
+EBUILD seafile-6.1.4.ebuild 1126 BLAKE2B 91321048dba6b1de7317e93cb57976d4c808e2ed5216a3cad08518e53612360ec567b2055a63a34dfd0d56e95c105750d27f3912a3d90c76e7fa214086234e9b SHA512 c8f564ca319459320d0059e81e94e728aef02e92f5d780a0f63928dcb845aaf53f93d0d05af6e9b8950390d65ed341c7f1e1760d2eaa2b9c7e0a0df59edb7947
MISC metadata.xml 416 BLAKE2B 72bb9c35eb247e292093a6fc05fc13228080139c50b1b3468fad25d08accd6bdc0a5c0bcbe27e058d123d9b289f6af01d9bde66843583faa7ab59b38f2018bc3 SHA512 e4d42b41560e43e00c0892649631a8f9a2114c95a2dda910b30bb4784c110a46f7effd1af0f09fcefcc7cf9287d5da8dfc51b69dfefc3e7d328387a842a6b000
diff --git a/net-misc/seafile/seafile-6.1.4.ebuild b/net-misc/seafile/seafile-6.1.4.ebuild
new file mode 100644
index 000000000000..8c268d75d841
--- /dev/null
+++ b/net-misc/seafile/seafile-6.1.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit autotools python-single-r1 vala
+
+DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
+HOMEPAGE="https://github.com/haiwen/seafile/ http://www.seafile.com/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ net-libs/libsearpc[${PYTHON_USEDEP}]
+ =net-libs/ccnet-${PV}[${PYTHON_USEDEP}]
+ >=dev-libs/glib-2.16.0:2
+ >=dev-libs/libevent-2.0
+ >=dev-libs/jansson-2.2.1
+ >=sys-libs/zlib-1.2.0
+ >=net-misc/curl-7.17
+ dev-libs/openssl:0=
+ dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+ $(vala_depend)"
+
+src_prepare() {
+ default
+ sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
+ eautoreconf
+ vala_src_prepare
+}
+
+src_install() {
+ default
+ # Remove unnecessary .la files, as recommended by ltprune.eclass
+ find "${ED}" -name '*.la' -delete || die
+ python_fix_shebang "${ED}"usr/bin
+}
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 7194b4c4f377..ea6ccb78d0ea 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,10 +1,6 @@
AUX unison-2.48.4-Makefile-dep.patch 542 BLAKE2B b32665bd2562c84aae1a801648c9324a0fafe39fb7d7d6be0b6bc52cdcd2f8282cfcde97fe2682b1d41656f65f1df9e32adc03660ef2c5c6a9394709c3d1e838 SHA512 e36704c7ac0fee66a308364ad72443a36ac14c1aacca0728b50f1770df91bf77347b58d218e93943a91cf2e99672840a6c322a5a4a5f238797d440ae16aa2394
-DIST unison-2.48.3-manual.html 278156 BLAKE2B 3534d497f2813b70644c1c6d9d24310dee5101c31f3066e9c51e9ac16dd9f2b4651d6bf07f13490534f5243ee4ff54549be668be22f9dc0d8fa7d48feee7844e SHA512 50924c624abd86f231ad8cbcfd4e383322a55733108685255df21df6da26d9ad1ac7d4f7d7dcd82faf4696f3f0136c0ff3c8cf5ffda4042f63451f2b7c8e9502
-DIST unison-2.48.3-manual.pdf 516703 BLAKE2B 79a502c2b6897c39600c73e172a9405027449f3bf1d89b34f31ba2df0271add2075296634fec1b2137ab4c4e27653b707f6f68c5130e4cc61d29370de06e4292 SHA512 3a16d6e0df6370784f960d37749f56a223c5eaab24ded299f6a61058f7692139239d0d64436d93268b4cbd8031de6139e187aca0beb54345a615e71253bce977
-DIST unison-2.48.3.tar.gz 1172646 BLAKE2B 5f44154920395ef0458972ccd85a4831f2cd491ba6853c081ede6b849922cbd15c1d02ea289d48fb9777eaec451919b090d734c7b7b262a18efec2828b182275 SHA512 169b272119b33146e4f770d1fc9a45d8278502a85a4ae02fd5cb94bade667bdd0ee31bef9acf6cf5170368ecfff948ee668ee195ff7e956c4eeaeed6f83d8d0d
DIST unison-2.48.4-manual.html 278110 BLAKE2B 8a85662399aff31a016964783b32c195cb32f5e6bab44c2f0f08740ab88393f4c73b98ecf58d6930bf103c1bec45720306343fa9fe39d3cdd73ffbbac2b9093c SHA512 b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68
DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e SHA512 514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
DIST unison-2.48.4.tar.gz 1200861 BLAKE2B 8e262e3e28b9f4cbe3925340aa3b08e99f1c30e8d3253cf2c82647e30708d30eb20c544184d54d1683ff9b01ac6913af0df924f0b16431ea2ac79bc95ec4a71f SHA512 c8e7bd2b14edae31e7d08154cdc2dce8173546b6163b9e5f4f2b1c8255792a7645d8449da88d7acfcbf498746481d24d0a3936978969920530a15a16bcbc6024
-EBUILD unison-2.48.3.ebuild 2194 BLAKE2B 590546036daed25edc337019f84901be17551218068f65a789f8f2fe5dd044cf2f4513a73a72ed74bf9d1d65d6d9860d747e7948be923014a88d526cbd49bd2f SHA512 602cfa6731ff3844c5abdd03b8b4e4e327fc80ac9c1aee7fd8a8292c81f880472748741f09e4ec43ddab71e739036a4f494c0eafd38073a535cd160eb3ef09d7
EBUILD unison-2.48.4.ebuild 2339 BLAKE2B 18690805b5ca16fe8e5ecf7906c464459d3a04a8858592a6fe32d40c616a66b3af38e98f13970dca2200d657ff6cf4627e0420008588c4c5192017934cc39e4b SHA512 daf666874caaa8e991136e7ac67281c75d3572e39c4aebdd6422941411dc59f6b5c339c99660339e284984df5b785c3de47b2fbf1e2d450a0b60144d67b787ef
MISC metadata.xml 243 BLAKE2B 010ca240ae06e9a9f6d7ba213eb06df36d9ba862ff2d2458d98a9fea1a1e7f3026d13832a73bce1b3ad9345029425e6abfae9e03bf126f2329b3f030ed3753fd SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449
diff --git a/net-misc/unison/unison-2.48.3.ebuild b/net-misc/unison/unison-2.48.3.ebuild
deleted file mode 100644
index 19d3bb695fb9..000000000000
--- a/net-misc/unison/unison-2.48.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils versionator
-
-IUSE="gtk doc static debug threads +ocamlopt test"
-
-DESCRIPTION="Two-way cross-platform file synchronizer"
-HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/"
-LICENSE="GPL-2"
-SLOT="$(get_version_component_range 1-2 ${PV})"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-
-# ocaml version so we are sure it has ocamlopt use flag
-DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
- gtk? ( >=dev-ml/lablgtk-2.2 )
- test? ( || ( dev-util/ctags virtual/emacs ) )"
-
-RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2
- || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
- !net-misc/unison:0
- app-eselect/eselect-unison"
-
-#PDEPEND="gtk? ( media-fonts/font-schumacher-misc )"
-
-SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
- doc? ( http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
- http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
-
-src_compile() {
- local myconf
-
- if use threads; then
- myconf="$myconf THREADS=true"
- fi
-
- if use static; then
- myconf="$myconf STATIC=true"
- fi
-
- if use debug; then
- myconf="$myconf DEBUGGING=true"
- fi
-
- if use gtk; then
- myconf="$myconf UISTYLE=gtk2"
- else
- myconf="$myconf UISTYLE=text"
- fi
-
- use ocamlopt || myconf="$myconf NATIVE=false"
-
- # Discard cflags as it will try to pass them to ocamlc...
- emake $myconf CFLAGS="" buildexecutable
-}
-
-src_test() {
- emake selftest
-}
-
-src_install () {
- # install manually, since it's just too much
- # work to force the Makefile to do the right thing.
- newbin unison unison-${SLOT}
- dodoc BUGS.txt CONTRIB INSTALL NEWS \
- README ROADMAP.txt TODO.txt
-
- if use doc; then
- dohtml "${DISTDIR}/${P}-manual.html"
- dodoc "${DISTDIR}/${P}-manual.pdf"
- fi
- use ocamlopt || export STRIP_MASK="*/bin/*"
-}
-
-pkg_postinst() {
- elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}"
- elog "in your profile files to access exactly this version over ssh."
- elog "Or you can use 'eselect unison' to set the version."
-}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index bd1cb8f0fcfb..4e6d99e7f485 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,10 +1,10 @@
DIST youtube-dl-2017.03.16.tar.gz 2631620 BLAKE2B 2aff8710a296140a4329b0f8e7f57526684ca114ba39a7397eef81b1b79b4b5dfae685c1f0011cddf8569d8df1e50111bbce7f12647c067972c79ea3b116b2ff SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c
DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
-DIST youtube-dl-2017.12.23.tar.gz 2859430 BLAKE2B 55d30e77e1689b221d554ea0fd6327b42043c9410f74ce35f87956dfbf3da986b254657ca4c71cd4c7bf8bbddb2477cdbd96caebd0d52803b14e5466ac43988a SHA512 f8aa96e2cc328453abaaa84b9a0c0f28ea929a9c3877128d398ec5eb080b187bd01bcfc07ed590e84d1f58af00f0cbb219b4ac3f01045486c0472c6d707e4d9c
DIST youtube-dl-2017.12.31.tar.gz 2872519 BLAKE2B cbf06f545f580d4bb3c5f58ea9a38291cdb358114787a93a1889e3c07c17fb2a832b7a25fecb6f92cdba8731fc32b9eed5ae4f5a52d0d6a103c3d3d4ef6b9ba5 SHA512 c6cd663627d2291c0eb6e1d711772f6640555d19f34533e1784cba4e6c983522db6dc3e44140dfcdad900db12024548bd5b16f89e60a5531538d7dcb36a8cd93
+DIST youtube-dl-2018.01.07.tar.gz 2877870 BLAKE2B 8def952710c4500e251641b4ca458ba4810c84435c504ca44569211d3d762efe4a5086f12bf9edee0944b5894697e5be359abead41282f637bab83addbbf67cc SHA512 ac5f603eb61b367fb26c07213f8350b1a305bad41a4d6beaa65f1568e6365e666818c67be35ce118de495bbdc980c9eb599b9273e7bb79f2e40dd23732d9a6fd
EBUILD youtube-dl-2017.03.16.ebuild 2381 BLAKE2B bbf217461544a08786e3ba044e9b704354133dde4197d05ad92a8cdfd2e402dd0c013964da8b7971475a31ced7db734c89ef3ea33991b0227980d4025490c0fa SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862
EBUILD youtube-dl-2017.11.15.ebuild 2379 BLAKE2B 34ee4dfda07511e1f1e27576b967341bba6329312751cf5bc49fd54fe1bd6c2a5444ca0b82a25c15a40901b7a2edf743cfbb08e3bfcfca72e9dc5afe420605ed SHA512 f3996f3fe5ff5d92025a1adf594db099114e1a9a2e831d26fa8472c1cea1e3792a81996407b0349f244aeba1489f6ea1b757aaab827d5af55a6cad5a18a8eddf
-EBUILD youtube-dl-2017.12.23.ebuild 3286 BLAKE2B 27dc317b224b7be4752e59ada595412101e6b5d5efa8baf703a61d690b92cc128a6c18e67a741cbced16a7be017555d038e54cebe832cc8980e0314ef3657c78 SHA512 0d49a470d4be463db904d18b3d37adbd5445900f2e0be45912c86a951942c158e3bba9fe4faa8976432d76e6438f199915583c6fb7cec9e5323680363a442d34
EBUILD youtube-dl-2017.12.31.ebuild 3286 BLAKE2B e846a48522924ae983a0b5b078b42523a2dccf22d23340e52348507f8718d01965a1a97c7a0c5ab10caaee1133536f8932d327d08eddf8f8982958aa84c29456 SHA512 67e4d6e79fd04259bf95d30ecb051527d0c864002b80f28734f37cd38ad9728743334b2fc786c652582c9ff9d79bde6f46507e68de41e84decefb87db8e8e0d0
+EBUILD youtube-dl-2018.01.07.ebuild 3284 BLAKE2B a36074bf28f7e0a3f835ca1b0231b3eb02fbe4de5b3df7420f8f0ec036e088658b2f8b9dc34e255d84559c12b34adf3b259231c8137f4d74679f9e1a51be2ce9 SHA512 9b12579cb1afd266c835016733cced4b2f1108ba0d30bfc855ae5b36eb31bb63e739fc78e30e2d37145e404d0c5e3d0f37797f0efa863b553324d69b26bc6a50
EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11
MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2017.12.23.ebuild b/net-misc/youtube-dl/youtube-dl-2018.01.07.ebuild
index b94326c98c67..db51a779b025 100644
--- a/net-misc/youtube-dl/youtube-dl-2017.12.23.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2018.01.07.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@ inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
DESCRIPTION="Download videos from YouTube.com (and more sites...)"
HOMEPAGE="https://rg3.github.com/youtube-dl/"
-SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
@@ -32,15 +32,14 @@ python_prepare_all() {
local xxx=(
alphaporno anysex behindkink camwithher chaturbate eporner
eroprofile extremetube foxgay goshgay hellporno hentaistigma
- hornbunny keezmovies lovehomeporn mofosex motherless myvidster
- porn91 porncom pornflip pornhd pornotube pornovoisines pornoxo
- ruleporn sexu slutload spankbang spankwire sunporno thisav tube8
- vporn watchindianporn xbef xnxx xtube xvideos xxxymovies youjizz
- youporn
+ hornbunny keezmovies lovehomeporn mofosex myvidster porn91 porncom
+ pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu
+ slutload spankbang spankwire sunporno thisav tube8 vporn
+ watchindianporn xbef xnxx xtube xvideos xxxymovies youjizz youporn
)
# these have multi-line import statements
local mxxx=(
- drtuber fourtube pornhub redtube tnaflix xhamster
+ drtuber fourtube motherless pornhub redtube tnaflix xhamster
)
# do single line imports
sed -i \