gentoo resync : 29.05.2018

3 files changed, 3 insertions, 78 deletions

diff --git a/net-p2p/pybitmessage/Manifest b/net-p2p/pybitmessage/Manifest
index 725617fdb2db..c61395ed7a80 100644
--- a/net-p2p/pybitmessage/Manifest
+++ b/net-p2p/pybitmessage/Manifest
@@ -1,5 +1,3 @@
-DIST pybitmessage-0.4.2.tar.gz 547565 BLAKE2B 8cb7bc0407601f06c5d0040fa03372e95c34e21aed79021001f7067b3340c60a08f7ab7d2c6578e78e1f7bf09a5adc5805252a27cf8e1bda27de6d1495382e35 SHA512 5e783243db4f507ec221092f6da18d25bb15a8c83f28aab7c1796a063d2608c0115c9d636cc73b66a09264a4ff69dda9ba373eff81640b1dd9595100dcdc4917
-DIST pybitmessage-0.6.3.2_p20180326.tar.gz 1102343 BLAKE2B 55d1458858c1431f341feae10b151590bf8dc577d5a52e5ddfbb629853373339f80d0fb9a855cc82deb50ee952d7a356c0140b67ed1d28108a5c8f19d3b97305 SHA512 836dc5a2fbea96bd46bd50e6462ccb118f22591e9d838af80f05bcce3efa8434942b112725a0b5b161d9c0a544520931e56cfc01c33ea4d231bdc02c112c5894
-EBUILD pybitmessage-0.4.2.ebuild 1491 BLAKE2B bd2a91e4a9142decd90587706e12319806e7ac3d25ed239cf0ad3bef70288b8e8383f5b0c247239778d7cd9e5f3ae56ba41beb32d19a82fa817b7473ab117f63 SHA512 158c5280052bcc4d359f96232e712c85167b088253b08c623c1453e8e8d261edcea09c4c8ae0f9fc72ffeaee63ec8084c6391b1989e6f293adf1bfe98f5fc1cf
-EBUILD pybitmessage-0.6.3.2_p20180326-r1.ebuild 1715 BLAKE2B 1a90206fc5edb53bc6e40b0b31396dd88b080ad6d0699374815b66bf19a4df299f3be72cde1bca3d3d5dbf9a9d420264941ff82ffa2fa6f365bf0ad5b7780e24 SHA512 ba1aad10c2942ccb7aa7380ed1e6f8cec0d01732308d1a05caf1746c129a43ab565bdc19a1b18ce88db0eb69bb1480b8814c6e11b4653ef3e140e97ba48cf3d7
+DIST pybitmessage-0.6.3.2_p20180521.tar.gz 1102349 BLAKE2B 346834ba6a6f7805ad79e95137b922b74963dd2c9da1b978e6e161be1e82b8465443ba1de255a6ab3c909c7ee1328509123eaf129dbafa13ec8c0d9f8291c93b SHA512 ef7e64e67cd6438fea1835db26c6ab71af004e1f6a7fb2cb8681674024a1addaeef1a31d959b1f0d3e502d8b96b3c07c6b6e0840e86dff12768ecd36e4fdf026
+EBUILD pybitmessage-0.6.3.2_p20180521.ebuild 1715 BLAKE2B ba16163cf4c602e4f2f03e3e491ba59fb02384f954e4a98c15252ff88f3a740bcd22dc81b9c560f3a674166491971b0ce5e2382bf8c76da1a5c6e1bf82fe87c4 SHA512 6697e5ff79a67bcb432fd7177ad94824fae03f40815d0477dbd2a48be672e488f1fb48ef224e9e7fb9e32fd7ea5ea17327de6da09c34f01de1832bd0c3e590cc
 MISC metadata.xml 1156 BLAKE2B 9b20373355740d63c1d8e9d2d0b1c569d2d8944a7a477b871a3bc9ec741321fb71670ab9dde1753348369c91e9c2ca17a05d6830ce8ffa9288599e595d06f654 SHA512 0a5d180118567c9d120584a03ed920f2f73931653f714ad7d68ea38cc427e8e443e7a518cc5039f61dcfea9d0c13f889c82124d2009f51bc13e96381bce77c0d
diff --git a/net-p2p/pybitmessage/pybitmessage-0.4.2.ebuild b/net-p2p/pybitmessage/pybitmessage-0.4.2.ebuild
deleted file mode 100644
index b9c9b12407d1..000000000000
--- a/net-p2p/pybitmessage/pybitmessage-0.4.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-r1 gnome2-utils
-
-DESCRIPTION="P2P communications protocol"
-HOMEPAGE="https://bitmessage.org"
-SRC_URI="https://github.com/Bitmessage/PyBitmessage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-libs/openssl[-bindist]
-	dev-python/PyQt4[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/PyBitmessage-${PV}
-
-src_compile() { :; }
-
-src_install () {
-	cat >> "${T}"/${PN}-wrapper <<-EOF
-	#!/usr/bin/env python
-	import os
-	import sys
-	sys.path.append("@SITEDIR@")
-	os.chdir("@SITEDIR@")
-	os.execl('@PYTHON@', '@EPYTHON@', '@SITEDIR@/bitmessagemain.py')
-	EOF
-
-	touch src/__init__.py || die
-
-	install_python() {
-		python_moduleinto ${PN}
-		python_domodule src/*
-		sed \
-			-e "s#@SITEDIR@#$(python_get_sitedir)/${PN}#" \
-			-e "s#@EPYTHON@#${EPYTHON}#" \
-			-e "s#@PYTHON@#${PYTHON}#" \
-			"${T}"/${PN}-wrapper > ${PN} || die
-		python_doscript ${PN}
-	}
-
-	python_foreach_impl install_python
-
-	dodoc README.md debian/changelog
-	doman man/*
-
-	newicon -s 24 desktop/icon24.png ${PN}.png
-	newicon -s scalable desktop/can-icon.svg ${PN}.svg
-	domenu desktop/${PN}.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-p2p/pybitmessage/pybitmessage-0.6.3.2_p20180326-r1.ebuild b/net-p2p/pybitmessage/pybitmessage-0.6.3.2_p20180521.ebuild
index 5c6c63027b57..8c8aa169578b 100644
--- a/net-p2p/pybitmessage/pybitmessage-0.6.3.2_p20180326-r1.ebuild
+++ b/net-p2p/pybitmessage/pybitmessage-0.6.3.2_p20180521.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="sqlite"
 
-COMMIT=b210fd84d1053d3a57a888ecc8444f580d4b0651
+COMMIT=30e211367003bafa67834ffff3f31e6b5a897f4b
 inherit distutils-r1 gnome2-utils
 
 MY_PN="PyBitmessage"