From ec7902445808cff34f01552f6d70a4c64154a32e Mon Sep 17 00:00:00 2001
From: Johannes Schwab <mail@jschwab.org>
Date: Sun, 20 Dec 2015 23:42:19 +0100
Subject: [PATCH] 0.9.33

---
 net-p2p/twister/Manifest                      |  2 +
 net-p2p/twister/twister-0.9.31_beta.ebuild    | 51 -------------------
 ...9.30_beta.ebuild => twister-0.9.33.ebuild} |  5 +-
 3 files changed, 4 insertions(+), 54 deletions(-)
 delete mode 100644 net-p2p/twister/twister-0.9.31_beta.ebuild
 rename net-p2p/twister/{twister-0.9.30_beta.ebuild => twister-0.9.33.ebuild} (85%)

diff --git a/net-p2p/twister/Manifest b/net-p2p/twister/Manifest
index 1e159f4..2176923 100644
--- a/net-p2p/twister/Manifest
+++ b/net-p2p/twister/Manifest
@@ -3,7 +3,9 @@ AUX twister-html-update 398 SHA256 6627875c8820fcd401c975d451880808a35d0496ca0f1
 DIST 5f0930b59b221a9efbed33cf8ce5d8d22a512b4f.tar.gz 6208386 SHA256 5753a2530dafaa99884a2c8931a3e538b9b85346fb2a36b9ec9b4ec28f3f4da6 SHA512 59e39cb04c4ef4261ae301366d36f2ea52b04155f1557cfb416e1d54c150c433d8c21c43d0232e44598899a92aaa099fdd45f3a4176f94f7ada197cdc650bc49 WHIRLPOOL 97e2d49088effd0edfb669dcb220da2d1b5eac85579627206c111bce2d0374eeee50af0dbd605bbee8c8c8063edcb200b42343849b95d4489fbfde2ff79b8d7e
 DIST 73dc8acc721dad039f05806929523967391edee8.tar.gz 6209419 SHA256 5a874d7ec66488857e97f7ec5351eedd774786b0460545a156dc09cbc839a8e3 SHA512 2291a67b6c509544c8a07909316727b77817172ef04aae86e15ce707441b21b3795c9226d2d4b9c688d1153ae8e62384821e499cd7e6f4c60f0e9b2ce4ca194e WHIRLPOOL c36005fe3138f2a33b97b35d8dd53117777d85425afea8491544e217a5a3620773a70f33ea246fbef13f0f7d7992df7fd21e4a50281c47dc9d4cdaeaa89ad0c7
 DIST twister-0.9.31-r1.tar.gz 6211128 SHA256 ccb85f5eaac46a668908c69063adcc796a2bb4cb69907b1c093dbf8fcf58c101 SHA512 9b7818d42862db0bbfa44c09f05e3f867c1a6222ce5f8f0c84b2362d76a4da56a8033646345607721987c305cbb01c601fe0f906fa70f55dd12e1991b36a7ebb WHIRLPOOL 37fc1ab0985ad76f26eb40159686da190c58cfd5e78a5b90620ccf3f4151b9360fbcea92444ef7b71b5dfb56c3e927234dacaec7cf7095697a46e46256620e7a
+DIST twister-0.9.33.tar.gz 6213707 SHA256 fbd457bb048a38c77d236bb13d321e2be0cc297ee0f5164ad705f8388da5bce2 SHA512 f88a06aac953985c0d287149a74d8f78c24010dc53e3c15f1ac832c031a4522402ffb06263af00835992fd8007a1366f819c7f6f0c2bdf6efd93ce321735d66d WHIRLPOOL fe51cd368efaf6fcbf70fa4cdb370a29b19210e264cb4610898db8ddc18ea5ed28adeb0c95db55574fd51ae36b0195cbb70300c8d1454bef690f8271350a292c
 EBUILD twister-0.9.30_beta.ebuild 1143 SHA256 9c0568f57a1aa0df9694a112992a489a8c61994e04672163b5b0a779e16fc5c5 SHA512 ee4398f4e919d80a479241b093386cdef8e5d5ce3ba85cb5f7e5f15e32af5705cc88e0556cdef27c29f65f17e7d6ab2f331cb195e6d21b75b5b09527da24dda6 WHIRLPOOL 2b0234ec0c709ba351532a1d5e1bfbd086c9d6403417fe6333fb7ae208e6f33b5d9473795a2fca164161da04f457c4c69650e1813aa3e479bbd03fae69cc31a2
 EBUILD twister-0.9.31-r1.ebuild 1102 SHA256 497efaeba096b750b5027106b9da9a0d070033d72bd8dbc9603504d0c5766d5e SHA512 fe088baabfb573a9fb75a0630ca2d018af6fe7113c271c1bb40b49dd6b9dfe817dd994c5b79cbe5e2d7687b06e75db22782ba85166275ef1e17156f0239d65c5 WHIRLPOOL 3a515e1f485a41020d8e885d72d01178355dd0aa9a4a718814794bb92b8d006f3831e4c97de4efe2df93e61926143a7b19ad82461f41bd19a3cef788676f48f1
 EBUILD twister-0.9.31_beta.ebuild 1143 SHA256 a58d7c182f4f8aa4e52edc6b9df03602d86a3ec4e9d2e1a0ed35164a7f6ff29a SHA512 3a072865debeabde6c73458ff2bb3482558f8e3d59235788b3904a0d305a8151952f777c9fb22cd5e91258e2dd09a3e4fbd5deebe0e879ceec9b7d8054016c7b WHIRLPOOL 573700f2d796e988c4e350cc1e6bd74c1ae03efb5a51f064a786a01aa56d43bb2edcc50445c6c0f8d0a046ca1e670f3643f38c6be13c10acc31da610a05dbfb2
+EBUILD twister-0.9.33.ebuild 1102 SHA256 497efaeba096b750b5027106b9da9a0d070033d72bd8dbc9603504d0c5766d5e SHA512 fe088baabfb573a9fb75a0630ca2d018af6fe7113c271c1bb40b49dd6b9dfe817dd994c5b79cbe5e2d7687b06e75db22782ba85166275ef1e17156f0239d65c5 WHIRLPOOL 3a515e1f485a41020d8e885d72d01178355dd0aa9a4a718814794bb92b8d006f3831e4c97de4efe2df93e61926143a7b19ad82461f41bd19a3cef788676f48f1
 MISC metadata.xml 233 SHA256 64eef535474fbc710fadceed478a7cbee7054993e2b41afc8a624e26040aa9de SHA512 35143a73e1054a65d6ce2adf66b8d3b520dca3aeefe540dcbeee509319378e760c3bc6d42a9ae3829422368e5802737264909af52a910a4e4158b0bcfa253d1c WHIRLPOOL 2a0321f1c2f54853fce3a1c1c0a60738674217fb621411bcd62cfa25e427cef1ccb375ce25595af117a1dc4e1f85150df88321fc8af78a019bf09deeb395e60b
diff --git a/net-p2p/twister/twister-0.9.31_beta.ebuild b/net-p2p/twister/twister-0.9.31_beta.ebuild
deleted file mode 100644
index 250e8af..0000000
--- a/net-p2p/twister/twister-0.9.31_beta.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-EAPI=5
-inherit eutils
-
-COMMIT="73dc8acc721dad039f05806929523967391edee8"
-
-DESCRIPTION="Peer-to-peer microblogging"
-HOMEPAGE="http://twister.net.co/"
-SRC_URI="https://github.com/miguelfreitas/twister-core/archive/${COMMIT}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="MIT BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tk"
-
-RDEPEND="dev-libs/openssl:*[-bindist]
-	sys-libs/db:4.8
-	dev-libs/boost
-	net-libs/miniupnpc
-	tk? ( || ( dev-lang/python:2.7[tk] dev-lang/python:2.6[tk] ) )"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/twister-core-${COMMIT}"
-
-src_configure() {
-	./bootstrap.sh
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	einstall
-
-	use tk || rm -f "${D}/usr/bin/twister-control"
-	use tk || rm -f "${D}/usr/share/applications/twister-control.desktop"
-
-	exeinto "/usr/bin/"
-	doexe "${FILESDIR}/twister-html-install"
-	doexe "${FILESDIR}/twister-html-update"
-}
-
-pkg_postinst() {
-	elog "Befor running twister, each user must set up twister's HTML files"
-	elog "in ~/.twister/html and the configs in ~/.twister/twister.conf."
-	elog "They can do this by running twister-html-install."
-	elog ""
-	elog "To keep the HTML files up to date, run twister-html-update."
-}
diff --git a/net-p2p/twister/twister-0.9.30_beta.ebuild b/net-p2p/twister/twister-0.9.33.ebuild
similarity index 85%
rename from net-p2p/twister/twister-0.9.30_beta.ebuild
rename to net-p2p/twister/twister-0.9.33.ebuild
index df22b00..7de47d6 100644
--- a/net-p2p/twister/twister-0.9.30_beta.ebuild
+++ b/net-p2p/twister/twister-0.9.33.ebuild
@@ -1,11 +1,10 @@
 EAPI=5
 inherit eutils
 
-COMMIT="5f0930b59b221a9efbed33cf8ce5d8d22a512b4f"
 
 DESCRIPTION="Peer-to-peer microblogging"
 HOMEPAGE="http://twister.net.co/"
-SRC_URI="https://github.com/miguelfreitas/twister-core/archive/${COMMIT}.tar.gz"
+SRC_URI="https://github.com/miguelfreitas/twister-core/archive/v${PV}.tar.gz -> ${PF}.tar.gz"
 RESTRICT="mirror"
 
 LICENSE="MIT BSD"
@@ -21,7 +20,7 @@ RDEPEND="dev-libs/openssl:*[-bindist]
 
 DEPEND="${RDEPEND}"
 
-S="${WORKDIR}/twister-core-${COMMIT}"
+S="${WORKDIR}/twister-core-${PV}"
 
 src_configure() {
 	./bootstrap.sh