From 067d52967f764f62a23ced2ce6c694f9077d50a1 Mon Sep 17 00:00:00 2001
From: Julian Ospald <hasufell@posteo.de>
Date: Fri, 22 Apr 2016 17:42:34 +0200
Subject: [PATCH] Use github.exlib where it makes sense

---
 packages/app-crypt/zuluCrypt/zuluCrypt-4.9.0.exheres-0   | 2 +-
 .../app-ergonomics/workrave/workrave-1.10.8.exheres-0    | 2 +-
 packages/dev-db/wxsqlite3/wxsqlite3-3.3.0.exheres-0      | 4 ++--
 packages/dev-games/mygui/mygui-3.2.2.exheres-0           | 6 +++---
 packages/dev-libs/d0_blind_id/d0_blind_id-0.5.exheres-0  | 2 +-
 packages/dev-libs/d0_blind_id/d0_blind_id-1.0.exheres-0  | 2 +-
 packages/dev-libs/mbedtls/mbedtls-2.2.1.exheres-0        | 2 +-
 packages/dev-util/xxdi/xxdi-1.0.0.exheres-0              | 4 ++--
 .../Commander-Genius/Commander-Genius-1.8.3.exheres-0    | 3 +--
 .../games-arcade/duckmarines/duckmarines-1.0.exheres-0   | 3 +--
 .../hawkthorne-journey-1.0.4.exheres-0                   | 3 ++-
 packages/games-arcade/mrrescue/mrrescue-1.02d.exheres-0  | 4 ++--
 packages/games-board/netmaumau/netmaumau-0.23.exheres-0  | 7 +++----
 packages/games-engines/flare/flare-0.19.exheres-0        | 5 +----
 packages/games-engines/openmw/openmw-0.39.0.exheres-0    | 4 +---
 packages/games-rpg/flare/flare-0.19.exheres-0            | 3 +--
 .../games-server/netmaumau/netmaumau-0.24.0.exheres-0    | 3 +--
 .../games-simulation/minetest/minetest-0.4.13.exheres-0  | 5 ++---
 packages/games-strategy/openra/openra-20151224.exheres-0 | 4 ++--
 .../pidgin-opensteamworks-1.6.1_p20160218.exheres-0      | 9 ++-------
 packages/net-misc/badvpn/badvpn-1.999.130.exheres-0      | 4 ++--
 .../youtube-viewer/youtube-viewer-3.2.1.exheres-0        | 8 +-------
 .../gentoo-functions/gentoo-functions-0.10.exheres-0     | 2 +-
 packages/sys-process/ctop/ctop-0.4.1.exheres-0           | 4 ++--
 packages/voip/umurmur/umurmur-0.2.16a.exheres-0          | 3 +--
 .../clearlooks-phenix/clearlooks-phenix-6.0.3.exheres-0  | 4 ++--
 26 files changed, 40 insertions(+), 62 deletions(-)

diff --git a/packages/app-crypt/zuluCrypt/zuluCrypt-4.9.0.exheres-0 b/packages/app-crypt/zuluCrypt/zuluCrypt-4.9.0.exheres-0
index 2c0fd713..cce9abd8 100644
--- a/packages/app-crypt/zuluCrypt/zuluCrypt-4.9.0.exheres-0
+++ b/packages/app-crypt/zuluCrypt/zuluCrypt-4.9.0.exheres-0
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 require cmake
+require github [ user=mhogomchungu ]
 
 SUMMARY="Front end to cryptsetup"
 HOMEPAGE="http://mhogomchungu.github.io/zuluCrypt/"
-DOWNLOADS="https://github.com/mhogomchungu/zuluCrypt/releases/download/${PV}/zuluCrypt-${PV}.tar.bz2"
 
 LICENCES="|| ( GPL-2 GPL-3 )"
 SLOT="0"
diff --git a/packages/app-ergonomics/workrave/workrave-1.10.8.exheres-0 b/packages/app-ergonomics/workrave/workrave-1.10.8.exheres-0
index e1719b0a..afc910bd 100644
--- a/packages/app-ergonomics/workrave/workrave-1.10.8.exheres-0
+++ b/packages/app-ergonomics/workrave/workrave-1.10.8.exheres-0
@@ -5,6 +5,7 @@
 require python [ blacklist=3 has_lib=false multibuild=false ]
 require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
 require gtk-icon-cache freedesktop-desktop freedesktop-mime
+require github [ user=rcaelers tag=v${PV//./_} ]
 
 SUMMARY="Helpful utility to attack Repetitive Strain Injury (RSI)"
 DESCRIPTION="
@@ -14,7 +15,6 @@ DESCRIPTION="
     daily limit.
 "
 HOMEPAGE="http://www.workrave.org/"
-DOWNLOADS="https://github.com/rcaelers/${PN}/archive/v${PV//./_}.tar.gz -> ${PNV}.tar.gz"
 
 LICENCES="GPL-3"
 SLOT="0"
diff --git a/packages/dev-db/wxsqlite3/wxsqlite3-3.3.0.exheres-0 b/packages/dev-db/wxsqlite3/wxsqlite3-3.3.0.exheres-0
index 4640aede..3a49be6c 100644
--- a/packages/dev-db/wxsqlite3/wxsqlite3-3.3.0.exheres-0
+++ b/packages/dev-db/wxsqlite3/wxsqlite3-3.3.0.exheres-0
@@ -1,9 +1,9 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
+require github [ user=utelle tag=v${PV} ]
+
 SUMMARY="C++ wrapper around the public domain SQLite 3.x database"
-HOMEPAGE="https://github.com/utelle/wxsqlite3"
-DOWNLOADS="https://github.com/utelle/wxsqlite3/archive/v${PV}.tar.gz -> ${PNV}.tar.gz"
 
 LICENCES="wxWinLL-3"
 SLOT="3.0"
diff --git a/packages/dev-games/mygui/mygui-3.2.2.exheres-0 b/packages/dev-games/mygui/mygui-3.2.2.exheres-0
index 4bbaeaf7..9be6dded 100644
--- a/packages/dev-games/mygui/mygui-3.2.2.exheres-0
+++ b/packages/dev-games/mygui/mygui-3.2.2.exheres-0
@@ -1,15 +1,14 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-MY_PN=MyGUI
-MY_PNV=${MY_PN}${PV}
+MY_PNV=MyGUI${PV}
 WORK="${WORKBASE}/${PN}-${MY_PNV}"
 
 require cmake [ api=2 ]
+require github [ user=MyGUI tag=${MY_PNV} ]
 
 SUMMARY="A library for creating GUIs for games"
 HOMEPAGE="http://mygui.info/"
-DOWNLOADS="https://github.com/MyGUI/mygui/archive/${MY_PNV}.tar.gz"
 
 LICENCES="MIT"
 SLOT="0"
@@ -24,6 +23,7 @@ DEPENDENCIES="
         x11-dri/mesa
 "
 
+
 DEFAULT_SRC_PREPARE_PATCHES=(
     -p0 "${FILES}"/${PNV}-underlinking.patch
     -p1 "${FILES}"/${PNV}-build.patch
diff --git a/packages/dev-libs/d0_blind_id/d0_blind_id-0.5.exheres-0 b/packages/dev-libs/d0_blind_id/d0_blind_id-0.5.exheres-0
index aeb3426f..4d011788 100644
--- a/packages/dev-libs/d0_blind_id/d0_blind_id-0.5.exheres-0
+++ b/packages/dev-libs/d0_blind_id/d0_blind_id-0.5.exheres-0
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
+require github [ user=divVerent tag=v${PV} ]
 
 SUMMARY="Blind-ID library for user identification using RSA blind signatures"
 HOMEPAGE="http://git.xonotic.org/?p=xonotic/d0_blind_id.git;a=summary"
-DOWNLOADS="https://github.com/divVerent/d0_blind_id/archive/v${PV}.tar.gz -> ${PNV}.tar.gz"
 
 LICENCES="BSD-3"
 SLOT="0"
diff --git a/packages/dev-libs/d0_blind_id/d0_blind_id-1.0.exheres-0 b/packages/dev-libs/d0_blind_id/d0_blind_id-1.0.exheres-0
index aeb3426f..4d011788 100644
--- a/packages/dev-libs/d0_blind_id/d0_blind_id-1.0.exheres-0
+++ b/packages/dev-libs/d0_blind_id/d0_blind_id-1.0.exheres-0
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
+require github [ user=divVerent tag=v${PV} ]
 
 SUMMARY="Blind-ID library for user identification using RSA blind signatures"
 HOMEPAGE="http://git.xonotic.org/?p=xonotic/d0_blind_id.git;a=summary"
-DOWNLOADS="https://github.com/divVerent/d0_blind_id/archive/v${PV}.tar.gz -> ${PNV}.tar.gz"
 
 LICENCES="BSD-3"
 SLOT="0"
diff --git a/packages/dev-libs/mbedtls/mbedtls-2.2.1.exheres-0 b/packages/dev-libs/mbedtls/mbedtls-2.2.1.exheres-0
index 6dd74a9e..bbed6f72 100644
--- a/packages/dev-libs/mbedtls/mbedtls-2.2.1.exheres-0
+++ b/packages/dev-libs/mbedtls/mbedtls-2.2.1.exheres-0
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 require cmake
+require github [ user=ARMmbed tag=mbedtls-${PV} ]
 
 SUMMARY="Cryptographic library for embedded systems"
 HOMEPAGE="https://tls.mbed.org/"
-DOWNLOADS="https://github.com/ARMmbed/mbedtls/archive/mbedtls-${PV}.tar.gz"
 
 LICENCES="Apache-2.0"
 SLOT="0"
diff --git a/packages/dev-util/xxdi/xxdi-1.0.0.exheres-0 b/packages/dev-util/xxdi/xxdi-1.0.0.exheres-0
index 583e6a5b..b304263f 100644
--- a/packages/dev-util/xxdi/xxdi-1.0.0.exheres-0
+++ b/packages/dev-util/xxdi/xxdi-1.0.0.exheres-0
@@ -3,9 +3,9 @@
 
 MODULE_VERSION=001
 
+require github [ user=gregkh tag=v${MODULE_VERSION} ]
+
 SUMMARY="Simple alternative to vim's 'xxd -i' mode"
-HOMEPAGE="https://github.com/gregkh/xxdi"
-DOWNLOADS="https://github.com/gregkh/xxdi/archive/v${MODULE_VERSION}.tar.gz -> ${PNV}.tar.gz"
 
 LICENCES="GPL-2"
 SLOT="0"
diff --git a/packages/games-arcade/Commander-Genius/Commander-Genius-1.8.3.exheres-0 b/packages/games-arcade/Commander-Genius/Commander-Genius-1.8.3.exheres-0
index da746acc..0e6b1e4a 100644
--- a/packages/games-arcade/Commander-Genius/Commander-Genius-1.8.3.exheres-0
+++ b/packages/games-arcade/Commander-Genius/Commander-Genius-1.8.3.exheres-0
@@ -2,10 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 require cmake gtk-icon-cache
+require github [ user=gerstrong tag=v${PV//./}release ]
 
 SUMMARY="Open Source Commander Keen clone (needs original game files)"
-HOMEPAGE="http://clonekeenplus.sourceforge.net"
-DOWNLOADS="https://github.com/gerstrong/${PN}/archive/v${PV//./}release.tar.gz -> ${PNV}.tar.gz"
 
 LICENCES="GPL-2 LGPL-2"
 SLOT="0"
diff --git a/packages/games-arcade/duckmarines/duckmarines-1.0.exheres-0 b/packages/games-arcade/duckmarines/duckmarines-1.0.exheres-0
index d0c31c81..dfa7d0f9 100644
--- a/packages/games-arcade/duckmarines/duckmarines-1.0.exheres-0
+++ b/packages/games-arcade/duckmarines/duckmarines-1.0.exheres-0
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 require love-app [ loveslot="0.9" lovezip=true lovepn=${PNV} ]
+require github [ user=SimonLarsen release=v${PV}b pnv=${PNV}-love suffix=zip ]
 
 SUMMARY="Free software ChuChu Rocket remake for PC"
 HOMEPAGE="http://tangramgames.dk/games/duckmarines/"
-DOWNLOADS="https://github.com/SimonLarsen/duckmarines/releases/download/v${PV}b/duckmarines-${PV}-love.zip"
 
 # no license info for Tserial.lua
 # https://love2d.org/wiki/Tserial
@@ -17,5 +17,4 @@ LICENCES="
 SLOT="0"
 PLATFORMS="~amd64 ~x86"
 
-WORK=${WORKBASE}/${PNV}-love
 
diff --git a/packages/games-arcade/hawkthorne-journey/hawkthorne-journey-1.0.4.exheres-0 b/packages/games-arcade/hawkthorne-journey/hawkthorne-journey-1.0.4.exheres-0
index 5ae83fff..bdafcd2d 100644
--- a/packages/games-arcade/hawkthorne-journey/hawkthorne-journey-1.0.4.exheres-0
+++ b/packages/games-arcade/hawkthorne-journey/hawkthorne-journey-1.0.4.exheres-0
@@ -1,11 +1,12 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
+require github [ user=hawkthorne release=v${PV} pnv=hawkthorne suffix=love ]
 require love-app [ loveslot="0.9" lovepn=${PNV} ]
 
 SUMMARY="2d platformer based on the Community's Digital Estate Planning episode"
 HOMEPAGE="http://projecthawkthorne.com/"
-DOWNLOADS="https://github.com/hawkthorne/hawkthorne-journey/releases/download/v${PV}/hawkthorne.love -> ${PNV}.love"
+DOWNLOADS="${DOWNLOADS} -> ${PNV}.love"
 
 LICENCES="
     MIT [[ note = [ main game ] ]]
diff --git a/packages/games-arcade/mrrescue/mrrescue-1.02d.exheres-0 b/packages/games-arcade/mrrescue/mrrescue-1.02d.exheres-0
index 85d917f2..0c3e41be 100644
--- a/packages/games-arcade/mrrescue/mrrescue-1.02d.exheres-0
+++ b/packages/games-arcade/mrrescue/mrrescue-1.02d.exheres-0
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 require gtk-icon-cache
+require github [ user=SimonLarsen release=v${PV} suffix=love ]
 require love-app [ loveslot="0.10" lovepn=${PNV} ]
 
 SUMMARY="Arcade styled 2d action game centered around evacuating civilians from burning buildings"
 HOMEPAGE="http://tangramgames.dk/games/mrrescue/"
-DOWNLOADS="https://github.com/SimonLarsen/mrrescue/releases/download/v${PV}/${PNV}.love
-	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png"
+DOWNLOADS+=" https://dev.gentoo.org/~hasufell/distfiles/${PN}.png"
 
 LICENCES="CCPL-Attribution-ShareAlike-3.0 MIT ZLIB"
 SLOT="0"
diff --git a/packages/games-board/netmaumau/netmaumau-0.23.exheres-0 b/packages/games-board/netmaumau/netmaumau-0.23.exheres-0
index 66dbbc51..da96cdce 100644
--- a/packages/games-board/netmaumau/netmaumau-0.23.exheres-0
+++ b/packages/games-board/netmaumau/netmaumau-0.23.exheres-0
@@ -2,13 +2,12 @@
 #                     Heiko Schaefer <heiko@rangun.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require qmake [ slot=4 ]
-
 MY_P=nmm-qt-client${PV}
 
+require qmake [ slot=4 ]
+require github [ user=velnias75 project=NetMauMau-Qt-Client tag=V${PV} ]
+
 SUMMARY="Client for games-server/netmaumau, the popular card game Mau Mau"
-HOMEPAGE="http://sourceforge.net/projects/netmaumau"
-DOWNLOADS="https://github.com/velnias75/NetMauMau-Qt-Client/archive/V${PV}.tar.gz -> ${PNV}-client.tar.gz"
 
 LICENCES="LGPL-3"
 SLOT="0"
diff --git a/packages/games-engines/flare/flare-0.19.exheres-0 b/packages/games-engines/flare/flare-0.19.exheres-0
index 348b486f..4126ee5f 100644
--- a/packages/games-engines/flare/flare-0.19.exheres-0
+++ b/packages/games-engines/flare/flare-0.19.exheres-0
@@ -2,10 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 require cmake
+require github [ user=clintbellanger project=flare-engine tag=v${PV} pn=flare-engine ]
 
 SUMMARY="Free/Libre Action Roleplaying game engine"
-HOMEPAGE="https://github.com/clintbellanger/flare-engine"
-DOWNLOADS="https://github.com/clintbellanger/flare-engine/archive/v${PV}.tar.gz -> ${PNV}-engine.tar.gz"
 
 LICENCES="CCPL-Attribution-ShareAlike-3.0 GPL-3 OFL-1.1"
 SLOT="0"
@@ -19,8 +18,6 @@ DEPENDENCIES="
         media-libs/SDL_ttf:0
 "
 
-WORK=${WORKBASE}/flare-engine-${PV}
-
 CMAKE_SRC_CONFIGURE_PARAMS=(
     -DBINDIR="/usr/$(exhost --target)/bin"
     -DDATADIR=/usr/share/${PN}
diff --git a/packages/games-engines/openmw/openmw-0.39.0.exheres-0 b/packages/games-engines/openmw/openmw-0.39.0.exheres-0
index 00e2a57c..50c207e9 100644
--- a/packages/games-engines/openmw/openmw-0.39.0.exheres-0
+++ b/packages/games-engines/openmw/openmw-0.39.0.exheres-0
@@ -2,14 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 
-WORK=${WORKBASE}/${PN}-${PNV}
-
 require gtk-icon-cache
+require github [ user=OpenMW tag=${PNV} ]
 require cmake [ api=2 ]
 
 SUMMARY="An open source reimplementation of TES III: Morrowind"
 HOMEPAGE="http://openmw.org/"
-DOWNLOADS="https://github.com/OpenMW/openmw/archive/${PNV}.tar.gz"
 
 LICENCES="GPL-3 MIT bitstream-font OFL-1.1"
 SLOT="0"
diff --git a/packages/games-rpg/flare/flare-0.19.exheres-0 b/packages/games-rpg/flare/flare-0.19.exheres-0
index daa45f2e..6b8efa57 100644
--- a/packages/games-rpg/flare/flare-0.19.exheres-0
+++ b/packages/games-rpg/flare/flare-0.19.exheres-0
@@ -1,11 +1,10 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
+require github [ user=clintbellanger project=flare-game tag=v${PV} pn=flare-game ]
 require cmake gtk-icon-cache
 
 SUMMARY="Free/Libre Action Roleplaying game"
-HOMEPAGE="https://github.com/clintbellanger/flare-game"
-DOWNLOADS="https://github.com/clintbellanger/flare-game/archive/v${PV}.tar.gz -> ${PNV}-game.tar.gz"
 
 LICENCES="CCPL-Attribution-ShareAlike-3.0 GPL-2 GPL-3 OFL-1.1"
 SLOT="0"
diff --git a/packages/games-server/netmaumau/netmaumau-0.24.0.exheres-0 b/packages/games-server/netmaumau/netmaumau-0.24.0.exheres-0
index 6c04b603..ea7e5fa7 100644
--- a/packages/games-server/netmaumau/netmaumau-0.24.0.exheres-0
+++ b/packages/games-server/netmaumau/netmaumau-0.24.0.exheres-0
@@ -6,10 +6,9 @@ require flag-o-matic
 require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
 require lua [ whitelist="5.1" multibuild=false ]
 require bash-completion
+require github [ user=velnias75 tag=V${PV} ]
 
 SUMMARY="Server for the popular card game Mau Mau"
-HOMEPAGE="http://sourceforge.net/projects/netmaumau"
-DOWNLOADS="https://github.com/velnias75/NetMauMau/archive/V${PV}.tar.gz -> ${PNV}-server.tar.gz"
 
 LICENCES="LGPL-3"
 SLOT="0"
diff --git a/packages/games-simulation/minetest/minetest-0.4.13.exheres-0 b/packages/games-simulation/minetest/minetest-0.4.13.exheres-0
index b3996d68..b37babdd 100644
--- a/packages/games-simulation/minetest/minetest-0.4.13.exheres-0
+++ b/packages/games-simulation/minetest/minetest-0.4.13.exheres-0
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+require github [ user=minetest ]
 require cmake gtk-icon-cache
 
 SUMMARY="An InfiniMiner/Minecraft inspired game"
 HOMEPAGE="http://minetest.net/"
-DOWNLOADS="http://github.com/minetest/minetest/tarball/${PV} -> ${PNV}.tar.gz
-    http://github.com/minetest/minetest_game/tarball/${PV} -> minetest_game-${PV}.tar.gz"
+DOWNLOADS+=" http://github.com/minetest/minetest_game/tarball/${PV} -> minetest_game-${PV}.tar.gz"
 
 LICENCES="|| ( LGPL-2.1 LGPL-3 ) CCPL-Attribution-ShareAlike-3.0"
 SLOT="0"
@@ -66,7 +66,6 @@ CMAKE_SRC_CONFIGURE_PARAMS=(
 
 src_unpack() {
     default
-    edo mv minetest-minetest-* ${PNV}
     edo mv minetest-minetest_game-* minetest_game-${PV}
 }
 
diff --git a/packages/games-strategy/openra/openra-20151224.exheres-0 b/packages/games-strategy/openra/openra-20151224.exheres-0
index 5384c998..46356ec2 100644
--- a/packages/games-strategy/openra/openra-20151224.exheres-0
+++ b/packages/games-strategy/openra/openra-20151224.exheres-0
@@ -3,10 +3,10 @@
 
 require desktop-utils gtk-icon-cache freedesktop-desktop freedesktop-mime
 require lua [ whitelist="5.1" multibuild=false ]
+require github [ user=OpenRA project=OpenRA tag=release-${PV} ]
 
 SUMMARY="A free RTS engine supporting games like Command & Conquer and Red Alert"
 HOMEPAGE="http://www.openra.net/"
-DOWNLOADS="https://github.com/OpenRA/OpenRA/archive/release-${PV}.tar.gz -> ${PNV}.tar.gz"
 
 ## this is a massive amount of 3rd party deps that would otherwise
 ## be fetched during build time
@@ -72,7 +72,7 @@ DEPENDENCIES="
 WORK=${WORKBASE}/OpenRA-release-${PV}
 
 src_unpack() {
-    unpack ${PNV}.tar.gz
+    unpack openra-release-${PV}.tar.gz
 
     # this is pure crapshit, but it will successfully die
     # if upstream has added/changed files
diff --git a/packages/net-im/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1_p20160218.exheres-0 b/packages/net-im/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1_p20160218.exheres-0
index 0318c8e3..b51405e6 100644
--- a/packages/net-im/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1_p20160218.exheres-0
+++ b/packages/net-im/pidgin-opensteamworks/pidgin-opensteamworks-1.6.1_p20160218.exheres-0
@@ -1,9 +1,9 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
+require github [ user=EionRobb rev=5a5bebab831618b658ffdeb418b8b2e430a18dd4 ]
+
 SUMMARY="Steam protocol plugin for pidgin"
-HOMEPAGE="https://github.com/eionrobb/pidgin-opensteamworks"
-DOWNLOADS="https://github.com/EionRobb/pidgin-opensteamworks/archive/5a5bebab831618b658ffdeb418b8b2e430a18dd4.tar.gz -> ${PNV}.tar.gz"
 
 LICENCES="GPL-3"
 SLOT="0"
@@ -41,11 +41,6 @@ DEFAULT_SRC_INSTALL_EXTRA_DOCS=(
     README.md
 )
 
-src_unpack() {
-    default
-    edo mv ${PN}-* ${PNV}
-}
-
 src_compile() {
     local STEAM_CRYPT_BACKEND=
 
diff --git a/packages/net-misc/badvpn/badvpn-1.999.130.exheres-0 b/packages/net-misc/badvpn/badvpn-1.999.130.exheres-0
index 2a1703a5..53b3b886 100644
--- a/packages/net-misc/badvpn/badvpn-1.999.130.exheres-0
+++ b/packages/net-misc/badvpn/badvpn-1.999.130.exheres-0
@@ -6,6 +6,7 @@
 #   Distributed under the terms of the GNU General Public License v2
 #   $Id$
 
+require github [ user=ambrop72 ]
 require cmake
 
 MY_PNV=${PN}-${PV/_rc/rc}
@@ -21,8 +22,7 @@ DESCRIPTION="
     The BadVPN package also includes other network-related software,
     like tun2socks and NCD.
 "
-HOMEPAGE="https://github.com/ambrop72/badvpn https://code.google.com/p/badvpn/"
-DOWNLOADS="https://github.com/ambrop72/badvpn/archive/${PV}.tar.gz -> ${PNV}.tar.gz"
+HOMEPAGE+=" https://code.google.com/p/badvpn/"
 
 LICENCES="BSD-3"
 PLATFORMS="~amd64 ~x86"
diff --git a/packages/net-misc/youtube-viewer/youtube-viewer-3.2.1.exheres-0 b/packages/net-misc/youtube-viewer/youtube-viewer-3.2.1.exheres-0
index 7d68e956..bc34d32b 100644
--- a/packages/net-misc/youtube-viewer/youtube-viewer-3.2.1.exheres-0
+++ b/packages/net-misc/youtube-viewer/youtube-viewer-3.2.1.exheres-0
@@ -3,10 +3,9 @@
 
 require gtk-icon-cache
 require perl-module
+require github [ user=trizen ]
 
 SUMMARY="A command line utility for viewing youtube-videos in Mplayer"
-HOMEPAGE="https://trizen.googlecode.com"
-DOWNLOADS="https://github.com/trizen/youtube-viewer/tarball/${PV} -> ${PNV}.tar.gz"
 
 LICENCES="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="0"
@@ -52,11 +51,6 @@ DEPENDENCIES="
 
 "
 
-src_unpack() {
-    default
-    edo mv trizen-${PN}-* "${WORK}"
-}
-
 src_configure() {
     if option gtk ; then
         PERL_MODULE_SRC_CONFIGURE_PARAMS=( --gtk-youtube-viewer )
diff --git a/packages/sys-apps/gentoo-functions/gentoo-functions-0.10.exheres-0 b/packages/sys-apps/gentoo-functions/gentoo-functions-0.10.exheres-0
index 0203df11..07625a80 100644
--- a/packages/sys-apps/gentoo-functions/gentoo-functions-0.10.exheres-0
+++ b/packages/sys-apps/gentoo-functions/gentoo-functions-0.10.exheres-0
@@ -6,9 +6,9 @@
 #     Distributed under the terms of the GNU General Public License v2
 
 require flag-o-matic
+require github [ user=gentoo ]
 
 HOMEPAGE="https://www.gentoo.org"
-DOWNLOADS="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${PNV}.tar.gz"
 
 SUMMARY="Base functions required by all gentoo systems"
 LICENCES="GPL-2"
diff --git a/packages/sys-process/ctop/ctop-0.4.1.exheres-0 b/packages/sys-process/ctop/ctop-0.4.1.exheres-0
index 65cdda7f..6494e6b7 100644
--- a/packages/sys-process/ctop/ctop-0.4.1.exheres-0
+++ b/packages/sys-process/ctop/ctop-0.4.1.exheres-0
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 require setup-py [ import=setuptools multibuild=false ]
+require github [ user=yadutaf tag=v${PV} ]
 
 SUMMARY="A lightweight top like monitor for linux CGroups"
-HOMEPAGE="https://github.com/yadutaf/ctop https://pypi.python.org/pypi/ctop"
-DOWNLOADS="https://github.com/yadutaf/ctop/archive/v${PV}.tar.gz -> ${PNV}.tar.gz"
+HOMEPAGE+=" https://pypi.python.org/pypi/ctop"
 
 LICENCES="MIT"
 SLOT="0"
diff --git a/packages/voip/umurmur/umurmur-0.2.16a.exheres-0 b/packages/voip/umurmur/umurmur-0.2.16a.exheres-0
index 9917a61a..0f4b7bd0 100644
--- a/packages/voip/umurmur/umurmur-0.2.16a.exheres-0
+++ b/packages/voip/umurmur/umurmur-0.2.16a.exheres-0
@@ -3,10 +3,9 @@
 
 require systemd-service
 require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
+require github [ user=fatbob313 ]
 
 SUMMARY="Minimalistic Murmur (Mumble server)"
-HOMEPAGE="https://github.com/fatbob313/umurmur"
-DOWNLOADS="https://github.com/fatbob313/${PN}/archive/${PV}.tar.gz -> ${PNV}.tar.gz"
 
 LICENCES="BSD-3"
 SLOT="0"
diff --git a/packages/x11-themes/clearlooks-phenix/clearlooks-phenix-6.0.3.exheres-0 b/packages/x11-themes/clearlooks-phenix/clearlooks-phenix-6.0.3.exheres-0
index b3262c12..a08d5d6a 100644
--- a/packages/x11-themes/clearlooks-phenix/clearlooks-phenix-6.0.3.exheres-0
+++ b/packages/x11-themes/clearlooks-phenix/clearlooks-phenix-6.0.3.exheres-0
@@ -1,9 +1,9 @@
 # Copyright 2014 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
+require github [ user=jpfleury ]
+
 SUMMARY="GTK+ 3 port of Clearlooks, the default theme for GNOME 2"
-HOMEPAGE="https://github.com/jpfleury/clearlooks-phenix"
-DOWNLOADS="https://github.com/jpfleury/clearlooks-phenix/archive/${PV}.tar.gz -> ${PNV}.tar.gz"
 
 LICENCES="GPL-3"
 SLOT="0"