[gentoo-commits] proj/gamerlay:master commit in: profiles/, games-util/lgogdownloader/, games-fps/xonotic-data/

[gentoo-commits] proj/gamerlay:master commit in: profiles/, games-util/lgogdownloader/, games-fps/xonotic-data/

[Vadim A. Misbakh-Soloviov]

commit:     48b738bcd413691ceac5acf6b9892123083d3cfa
Author:     Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Mon Sep  5 21:22:45 2016 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Mon Sep  5 21:22:59 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=48b738bc

fixes

 games-fps/xonotic-data/xonotic-data-9999.ebuild    |  4 ++-
 .../lgogdownloader/lgogdownloader-2.28.ebuild      | 26 +++++++++++++++++++
 .../lgogdownloader/lgogdownloader-2.6.ebuild       | 29 ----------------------
 .../lgogdownloader/lgogdownloader-9999.ebuild      | 29 ++++++++++------------
 profiles/use.local.desc                            |  1 +
 5 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/games-fps/xonotic-data/xonotic-data-9999.ebuild b/games-fps/xonotic-data/xonotic-data-9999.ebuild
index 160f6cf..fa76b55 100644
--- a/games-fps/xonotic-data/xonotic-data-9999.ebuild
+++ b/games-fps/xonotic-data/xonotic-data-9999.ebuild
@@ -29,6 +29,7 @@ DEPEND="
 "
 RESTRICT="test"
 
+pkg_pretend() {
 if use !client; then
 	CHECKREQS_DISK_BUILD="3000M"
 	CHECKREQS_DISK_USR="320M"
@@ -42,7 +43,8 @@ else
 	fi
 fi
 
-pkg_pretend() {
+	export CHECKREQS_DISK_USR CHECKREQS_DISK_USR
+
 	check-reqs_pkg_pretend
 }
 

diff --git a/games-util/lgogdownloader/lgogdownloader-2.28.ebuild b/games-util/lgogdownloader/lgogdownloader-2.28.ebuild
new file mode 100644
index 0000000..0bbca8b
--- /dev/null
+++ b/games-util/lgogdownloader/lgogdownloader-2.28.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit cmake-utils
+
+DESCRIPTION="Linux compatible gog.com downloader"
+HOMEPAGE="https://sites.google.com/site/gogdownloader/"
+SRC_URI="https://github.com/Sude-/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="WTFPL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/jsoncpp
+	net-libs/liboauth
+	net-misc/curl
+	dev-libs/boost
+	dev-libs/tinyxml
+	app-crypt/librhash
+	net-libs/htmlcxx
+"
+DEPEND="${RDEPEND}"

diff --git a/games-util/lgogdownloader/lgogdownloader-2.6.ebuild b/games-util/lgogdownloader/lgogdownloader-2.6.ebuild
deleted file mode 100644
index a6f031a..0000000
--- a/games-util/lgogdownloader/lgogdownloader-2.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: lgogdownloader-2.4.ebuild,v 1.0 2013/04/28 10:15:41 by frostwork Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Linux compatible gog.com downloader"
-HOMEPAGE="https://sites.google.com/site/gogdownloader/"
-SRC_URI="https://sites.google.com/site/gogdownloader/${P}.tar.gz"
-
-LICENSE="WTFPL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/jsoncpp
-		net-libs/liboauth
-		net-misc/curl
-		dev-libs/boost
-		dev-libs/tinyxml
-		app-crypt/librhash
-		net-libs/htmlcxx"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	dobin bin/Release/${PN}
-}

diff --git a/games-util/lgogdownloader/lgogdownloader-9999.ebuild b/games-util/lgogdownloader/lgogdownloader-9999.ebuild
index 4a20f3c..429eed9 100644
--- a/games-util/lgogdownloader/lgogdownloader-9999.ebuild
+++ b/games-util/lgogdownloader/lgogdownloader-9999.ebuild
@@ -1,29 +1,26 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: lgogdownloader-9999.ebuild,v 1.0 2013/04/28 15:06:41 by frostwork Exp $
 
-EAPI="4"
+EAPI="6"
 
-inherit eutils git-2
+inherit cmake-utils git-r3
 
 DESCRIPTION="Linux compatible gog.com downloader"
 HOMEPAGE="https://sites.google.com/site/gogdownloader/"
-EGIT_REPO_URI="git://github.com/Sude-/lgogdownloader.git"
+EGIT_REPO_URI="https://github.com/Sude-/lgogdownloader.git"
 
 LICENSE="WTFPL"
 SLOT="0"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="dev-libs/jsoncpp
-		net-libs/liboauth
-		net-misc/curl
-		dev-libs/boost
-		dev-libs/tinyxml
-		app-crypt/librhash
-		net-libs/htmlcxx"
+RDEPEND="
+	dev-libs/jsoncpp
+	net-libs/liboauth
+	net-misc/curl
+	dev-libs/boost
+	dev-libs/tinyxml
+	app-crypt/librhash
+	net-libs/htmlcxx
+"
 DEPEND="${RDEPEND}"
-
-src_install() {
-	dobin bin/Release/${PN}
-}

diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index b51386e..b476251 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2,6 +2,7 @@
 # your descriptions to your package's metadata.xml ONLY.
 # * generated automatically using egencache *
 
+dev-games/aseprite:bundled-libs - Use the upstream provided bundled version of allegro 4.4.2
 dev-games/aseprite:gtk3 - Enable support for the experimental native GTK File Dialog
 dev-games/aseprite:webp - Enable webp image format support
 dev-games/netradiant:darkplaces - Install DarkPlaces pack