public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gamerlay:master commit in: dev-games/netradiant/
@ 2011-02-26 22:52 Nikoli
  0 siblings, 0 replies; 8+ messages in thread
From: Nikoli @ 2011-02-26 22:52 UTC (permalink / raw
  To: gentoo-commits

commit:     4b8bfa5ebffef477c27c107bca2076e17f1572c0
Author:     Nikoli <nikoli <AT> lavabit <DOT> com>
AuthorDate: Sat Feb 26 22:52:27 2011 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Sat Feb 26 22:52:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=4b8bfa5e

netradiant: update packs

---
 dev-games/netradiant/ChangeLog              |    4 ++++
 dev-games/netradiant/metadata.xml           |    1 +
 dev-games/netradiant/netradiant-9999.ebuild |   11 +++++++----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dev-games/netradiant/ChangeLog b/dev-games/netradiant/ChangeLog
index 5571cdd..d5bc4ec 100644
--- a/dev-games/netradiant/ChangeLog
+++ b/dev-games/netradiant/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  26 Feb 2011; Nikoli <nikoli@lavabit.com> netradiant-9999.ebuild,
+  metadata.xml:
+  update packs
+
 *netradiant-1.5.0_p20110127 (27 Jan 2011)
 
   27 Jan 2011; Nikoli <nikoli@lavabit.com>

diff --git a/dev-games/netradiant/metadata.xml b/dev-games/netradiant/metadata.xml
index 9646529..754a3d2 100644
--- a/dev-games/netradiant/metadata.xml
+++ b/dev-games/netradiant/metadata.xml
@@ -15,6 +15,7 @@
 		<flag name='darkplaces'>Install DarkPlaces pack</flag>
 		<flag name='nexuiz'>Install Nexuiz pack</flag>
 		<flag name='openarena'>Install OpenArena non GPL pack</flag>
+		<flag name='osirion'>Install Osirion pack</flag>
 		<flag name='quake'>Install Quake non GPL pack</flag>
 		<flag name='quake2'>Install Quake2 non GPL pack</flag>
 		<flag name='quake2world'>Install Quake2World pack</flag>

diff --git a/dev-games/netradiant/netradiant-9999.ebuild b/dev-games/netradiant/netradiant-9999.ebuild
index 74ea58f..8ffbdde 100644
--- a/dev-games/netradiant/netradiant-9999.ebuild
+++ b/dev-games/netradiant/netradiant-9999.ebuild
@@ -16,6 +16,8 @@ HOMEPAGE="http://dev.alientrap.org/projects/netradiant"
 EGIT_REPO_URI="git://git.xonotic.org/xonotic/netradiant.git"
 BASE_ZIP_URI="http://ingar.satgnu.net/files/gtkradiant/gamepacks/"
 SRC_URI="
+	osirion? ( ${BASE_ZIP_URI}/OsirionPack.zip )
+	warsow? ( ${BASE_ZIP_URI}/WarsowPack.zip )
 	!bindist? (
 		openarena? ( ${BASE_ZIP_URI}/OpenArenaPack.zip )
 		quake? ( ${BASE_ZIP_URI}/QuakePack.zip )
@@ -27,7 +29,7 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-RADIANT_GPL_PACKS="darkplaces nexuiz quake2world warsow +xonotic"
+RADIANT_GPL_PACKS="darkplaces nexuiz osirion quake2world warsow +xonotic"
 RADIANT_NONGPL_PACKS="openarena quake quake2 quake3 tremulous ufoai"
 RADIANT_TOOLS="h2data q2map q3data q3map2 qdata3"
 RADIANT_PACKS="${RADIANT_GPL_PACKS} ${RADIANT_NONGPL_PACKS}"
@@ -49,8 +51,9 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	darkplaces? ( ${SUBVERSION_DEPEND} )
+	osirion? ( app-arch/unzip )
 	quake2world? ( ${SUBVERSION_DEPEND} )
-	warsow? ( ${SUBVERSION_DEPEND} )
+	warsow? ( app-arch/unzip )
 	xonotic? ( net-misc/wget )
 	!bindist? (
 		openarena? ( app-arch/unzip )
@@ -104,8 +107,8 @@ src_unpack() {
 			"https://zerowing.idsoftware.com/svn/radiant.gamepacks/DarkPlacesPack/branches/1.5/"
 		radiant_svn_unpack quake2world \
 			"svn://jdolan.dyndns.org/quake2world/trunk/gtkradiant"
-		radiant_svn_unpack warsow \
-			"https://svn.bountysource.com/wswpack/trunk/netradiant/games/WarsowPack/"
+		radiant_zip_unpack Osirion
+		radiant_zip_unpack Warsow
 
 		if use nexuiz; then
 			cd "${WORKDIR}/packs/" || die



^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: dev-games/netradiant/
@ 2011-07-05 22:26 Nikoli
  0 siblings, 0 replies; 8+ messages in thread
From: Nikoli @ 2011-07-05 22:26 UTC (permalink / raw
  To: gentoo-commits

commit:     823d3de59b239d58eb691087c0a55f2c3e7134d7
Author:     Nikoli <nikoli <AT> lavabit <DOT> com>
AuthorDate: Tue Jul  5 22:26:06 2011 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Tue Jul  5 22:26:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=823d3de5

netradiant: migrate to EAPI4 and git-2

(Portage version: 2.1.10.3/git/Linux x86_64, unsigned Manifest commit)

---
 dev-games/netradiant/ChangeLog                     |    4 ++
 .../netradiant/netradiant-1.5.0_p20110127.ebuild   |   30 +++++++--------
 dev-games/netradiant/netradiant-9999.ebuild        |   40 +++++++++----------
 3 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/dev-games/netradiant/ChangeLog b/dev-games/netradiant/ChangeLog
index d5bc4ec..1a02ae4 100644
--- a/dev-games/netradiant/ChangeLog
+++ b/dev-games/netradiant/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  05 Jul 2011; Nikoli <nikoli@lavabit.com> netradiant-1.5.0_p20110127.ebuild,
+  netradiant-9999.ebuild:
+  migrate to EAPI4 and git-2
+
   26 Feb 2011; Nikoli <nikoli@lavabit.com> netradiant-9999.ebuild,
   metadata.xml:
   update packs

diff --git a/dev-games/netradiant/netradiant-1.5.0_p20110127.ebuild b/dev-games/netradiant/netradiant-1.5.0_p20110127.ebuild
index 26e774d..1be2515 100644
--- a/dev-games/netradiant/netradiant-1.5.0_p20110127.ebuild
+++ b/dev-games/netradiant/netradiant-1.5.0_p20110127.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI="4"
 
 inherit eutils multilib toolchain-funcs
 
@@ -56,7 +56,7 @@ DEPEND="${RDEPEND}
 radiant_zip_unpack() {
 		if use ${1,,}; then
 			cd "${WORKDIR}/packs/" || die
-			unpack "${1}Pack.zip" || die
+			unpack "${1}Pack.zip"
 			mv ${1}Pack ${1,,} || die
 		fi
 }
@@ -107,43 +107,42 @@ src_configure() {
 
 	# dependencies-check wants gtk
 	if use gtk; then
-		emake dependencies-check || die
+		emake dependencies-check
 	fi
 }
 
 src_compile() {
-	emake ${targets// / binaries-} || die
+	emake ${targets// / binaries-}
 }
 
 src_install() {
 	insinto /usr/$(get_libdir)/${PN}
 	doins \
-		setup/data/tools/q3data.qdt \
-		|| die
+		setup/data/tools/q3data.qdt
 
 	dodoc ChangeLog ChangeLog.idsoftware CONTRIBUTORS TODO tools/quake3/q3map2/changelog.q3map{1,2.txt}
 
 	pushd install || die
 	exeinto /usr/$(get_libdir)/${PN}
 	for i in ${targets}; do
-		doexe ${i}.x86 || die
-		dosym /usr/$(get_libdir)/${PN}/${i}.x86 /usr/bin/${i} || die
+		doexe ${i}.x86
+		dosym /usr/$(get_libdir)/${PN}/${i}.x86 /usr/bin/${i}
 	done
 
 	# radiant
 	if use gtk; then
-		dosym /usr/$(get_libdir)/${PN}/radiant.x86 /usr/bin/${PN} || die
+		dosym /usr/$(get_libdir)/${PN}/radiant.x86 /usr/bin/${PN}
 
-		newicon "${S}"/icons/radiant-src.png ${PN}.png || die
+		newicon "${S}"/icons/radiant-src.png ${PN}.png
 		make_desktop_entry ${PN} NetRadiant ${PN} "Development;GTK;"
 
 		# modules
 		insinto /usr/$(get_libdir)/${PN}/modules
-		doins modules/*.so || die
+		doins modules/*.so
 
 		# plugins
 		insinto /usr/$(get_libdir)/${PN}/plugins
-		doins plugins/*.so || die
+		doins plugins/*.so
 
 		# data
 		popd || die
@@ -157,8 +156,7 @@ src_install() {
 			setup/data/tools/gl \
 			setup/data/tools/global.xlink \
 			setup/data/tools/plugins \
-			docs \
-			|| die
+			docs
 
 		# packs
 		for x in ${MY_RADIANT_PACKS//+/}; do
@@ -173,10 +171,10 @@ src_install() {
 					-e 's/^tremulous/trem/' \
 				)"
 				insinto /usr/$(get_libdir)/${PN}
-				doins -r ${n}.game || die
+				doins -r ${n}.game
 
 				insinto /usr/$(get_libdir)/${PN}/games
-				doins games/${n}.game || die
+				doins games/${n}.game
 			fi
 		done
 	fi

diff --git a/dev-games/netradiant/netradiant-9999.ebuild b/dev-games/netradiant/netradiant-9999.ebuild
index 8ffbdde..e5d318e 100644
--- a/dev-games/netradiant/netradiant-9999.ebuild
+++ b/dev-games/netradiant/netradiant-9999.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI="4"
 
 ESVN_DISABLE_DEPENDENCIES="true"
 ESVN_OPTIONS="--trust-server-cert --non-interactive"
 
-inherit eutils multilib toolchain-funcs subversion git
+inherit eutils multilib toolchain-funcs subversion git-2
 
 RADIANT_MAJOR_VERSION="5"
 RADIANT_MINOR_VERSION="0"
@@ -79,7 +79,7 @@ radiant_svn_unpack() {
 radiant_zip_unpack() {
 		if use ${1,,}; then
 			cd "${WORKDIR}/packs/" || die
-			unpack "${1}Pack.zip" || die
+			unpack "${1}Pack.zip"
 			mv ${1}Pack ${1,,} || die
 		fi
 }
@@ -98,7 +98,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	git_src_unpack
+	git-2_src_unpack
 
 	if use gtk; then
 		mkdir "${WORKDIR}/packs/" || die
@@ -122,11 +122,11 @@ src_unpack() {
 		fi
 
 		if use xonotic; then
+			unset EGIT_MASTER EGIT_BRANCH EGIT_COMMIT EGIT_PROJECT EGIT_DIR
 			EGIT_REPO_URI="git://git.xonotic.org/xonotic/netradiant-xonoticpack.git" \
-			EGIT_BRANCH="master" \
 			EGIT_PROJECT="${PN}-xonotic" \
-			S="${WORKDIR}/packs/xonotic" \
-			git_fetch
+			EGIT_SOURCEDIR="${WORKDIR}/packs/xonotic" \
+			git-2_src_unpack
 
 			cd "${WORKDIR}/packs/xonotic" || die
 			ewarn "Using \"wget\" directly for downloading from http://git.xonotic.org/"
@@ -179,43 +179,42 @@ src_configure() {
 
 	# dependencies-check wants gtk
 	if use gtk; then
-		emake dependencies-check || die
+		emake dependencies-check
 	fi
 }
 
 src_compile() {
-	emake ${targets// / binaries-} || die
+	emake ${targets// / binaries-}
 }
 
 src_install() {
 	insinto /usr/$(get_libdir)/${PN}
 	doins \
-		setup/data/tools/q3data.qdt \
-		|| die
+		setup/data/tools/q3data.qdt
 
 	dodoc ChangeLog ChangeLog.idsoftware CONTRIBUTORS TODO tools/quake3/q3map2/changelog.q3map{1,2.txt}
 
 	pushd install || die
 	exeinto /usr/$(get_libdir)/${PN}
 	for i in ${targets}; do
-		doexe ${i}.x86 || die
-		dosym /usr/$(get_libdir)/${PN}/${i}.x86 /usr/bin/${i} || die
+		doexe ${i}.x86
+		dosym /usr/$(get_libdir)/${PN}/${i}.x86 /usr/bin/${i}
 	done
 
 	# radiant
 	if use gtk; then
-		dosym /usr/$(get_libdir)/${PN}/radiant.x86 /usr/bin/${PN} || die
+		dosym /usr/$(get_libdir)/${PN}/radiant.x86 /usr/bin/${PN}
 
-		newicon "${S}"/icons/radiant-src.png ${PN}.png || die
+		newicon "${S}"/icons/radiant-src.png ${PN}.png
 		make_desktop_entry ${PN} NetRadiant ${PN} "Development;GTK;"
 
 		# modules
 		insinto /usr/$(get_libdir)/${PN}/modules
-		doins modules/*.so || die
+		doins modules/*.so
 
 		# plugins
 		insinto /usr/$(get_libdir)/${PN}/plugins
-		doins plugins/*.so || die
+		doins plugins/*.so
 
 		# data
 		popd || die
@@ -229,8 +228,7 @@ src_install() {
 			setup/data/tools/gl \
 			setup/data/tools/global.xlink \
 			setup/data/tools/plugins \
-			docs \
-			|| die
+			docs
 
 		# packs
 		for x in ${MY_RADIANT_PACKS//+/}; do
@@ -245,10 +243,10 @@ src_install() {
 					-e 's/^tremulous/trem/' \
 				)"
 				insinto /usr/$(get_libdir)/${PN}
-				doins -r ${n}.game || die
+				doins -r ${n}.game
 
 				insinto /usr/$(get_libdir)/${PN}/games
-				doins games/${n}.game || die
+				doins games/${n}.game
 			fi
 		done
 	fi



^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: dev-games/netradiant/
@ 2011-09-14 15:02 Nikoli
  0 siblings, 0 replies; 8+ messages in thread
From: Nikoli @ 2011-09-14 15:02 UTC (permalink / raw
  To: gentoo-commits

commit:     4edb5092357e4fa16d337d049b8c05261e9ef135
Author:     Nikoli <nikoli <AT> lavabit <DOT> com>
AuthorDate: Wed Sep 14 15:02:04 2011 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Wed Sep 14 15:02:04 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=4edb5092

netradiant: add snapshot (tags/xonotic-v0.5.0), git-2.eclass now has unpack, disable

(Portage version: 2.1.10.11/git/Linux x86_64, unsigned Manifest commit)

---
 dev-games/netradiant/ChangeLog                     |    6 +
 .../netradiant/netradiant-1.5.0_p20110827.ebuild   |  188 ++++++++++++++++++++
 dev-games/netradiant/netradiant-9999.ebuild        |    1 +
 3 files changed, 195 insertions(+), 0 deletions(-)

diff --git a/dev-games/netradiant/ChangeLog b/dev-games/netradiant/ChangeLog
index 1a02ae4..028a7b1 100644
--- a/dev-games/netradiant/ChangeLog
+++ b/dev-games/netradiant/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netradiant-1.5.0_p20110827 (14 Sep 2011)
+
+  14 Sep 2011; Nikoli <nikoli@lavabit.com> +netradiant-1.5.0_p20110827.ebuild,
+  netradiant-9999.ebuild:
+  add snapshot (tags/xonotic-v0.5.0), git-2.eclass now has unpack, disable
+
   05 Jul 2011; Nikoli <nikoli@lavabit.com> netradiant-1.5.0_p20110127.ebuild,
   netradiant-9999.ebuild:
   migrate to EAPI4 and git-2

diff --git a/dev-games/netradiant/netradiant-1.5.0_p20110827.ebuild b/dev-games/netradiant/netradiant-1.5.0_p20110827.ebuild
new file mode 100644
index 0000000..ceb818d
--- /dev/null
+++ b/dev-games/netradiant/netradiant-1.5.0_p20110827.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit eutils multilib toolchain-funcs
+
+RADIANT_MAJOR_VERSION="5"
+RADIANT_MINOR_VERSION="0"
+DESCRIPTION="NetRadiant is a fork of map editor for Q3 based games, GtkRadiant 1.5"
+HOMEPAGE="http://dev.alientrap.org/projects/netradiant"
+BASE_ZIP_URI="http://ingar.satgnu.net/files/gtkradiant/gamepacks/"
+SRC_URI="http://rion-overlay.googlecode.com/files/${P}.tar.xz
+	osirion? ( ${BASE_ZIP_URI}/OsirionPack.zip )
+	warsow? ( ${BASE_ZIP_URI}/WarsowPack.zip )
+	!bindist? (
+		openarena? ( ${BASE_ZIP_URI}/OpenArenaPack.zip )
+		quake? ( ${BASE_ZIP_URI}/QuakePack.zip )
+		quake2? ( ${BASE_ZIP_URI}/Quake2Pack.zip )
+		tremulous? ( ${BASE_ZIP_URI}/TremulousPack.zip )
+	)
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RADIANT_GPL_PACKS="darkplaces nexuiz osirion quake2world warsow +xonotic"
+RADIANT_NONGPL_PACKS="openarena quake quake2 tremulous"
+RADIANT_TOOLS="h2data q2map q3data q3map2 qdata3"
+RADIANT_PACKS="${RADIANT_GPL_PACKS} ${RADIANT_NONGPL_PACKS}"
+RADIANT_BINS=" ${RADIANT_TOOLS} gtk"
+IUSE="${RADIANT_PACKS} ${RADIANT_BINS// / +} bindist"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/libxml2
+	>=media-libs/libpng-1.2
+	>=sys-libs/zlib-1.2
+	gtk? (
+		>=x11-libs/gtk+-2.4:2
+		>=x11-libs/gtkglext-1
+		x11-libs/pango
+	)
+	!dev-games/gtkradiant
+"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	dev-util/pkgconfig
+	osirion? ( app-arch/unzip )
+	warsow? ( app-arch/unzip )
+	!bindist? (
+		openarena? ( app-arch/unzip )
+		quake? ( app-arch/unzip )
+		quake2? ( app-arch/unzip )
+		tremulous? ( app-arch/unzip )
+	)
+"
+
+radiant_zip_unpack() {
+		if use ${1,,}; then
+			cd "${WORKDIR}/packs/" || die
+			unpack "${1}Pack.zip"
+			mv ${1}Pack ${1,,} || die
+		fi
+}
+
+pkg_setup() {
+	targets=""
+	for i in ${RADIANT_BINS};do
+		if use $i; then
+			targets+=" ${i/gtk/radiant}"
+		fi
+	done
+	if [ "x$targets" = "x" ]; then
+		targets=" q3map2"
+		ewarn "You disabled all binaries: defaulting to USE=\"q3map2\""
+	fi
+}
+
+src_unpack() {
+	unpack ${P}.tar.xz
+
+	if use gtk; then
+		radiant_zip_unpack Osirion
+		radiant_zip_unpack Warsow
+
+		if use !bindist; then
+			MY_RADIANT_PACKS="${RADIANT_GPL_PACKS//+/} ${RADIANT_NONGPL_PACKS}"
+			radiant_zip_unpack OpenArena
+			radiant_zip_unpack Quake
+			radiant_zip_unpack Quake2
+			radiant_zip_unpack Tremulous
+		else
+			MY_RADIANT_PACKS="${RADIANT_GPL_PACKS//+/}"
+			for i in ${RADIANT_NONGPL_PACKS}; do
+				if use ${i}; then
+					ewarn "USE bindist disables ${i} non GPL pack"
+				fi
+			done
+		fi
+	fi
+}
+
+src_prepare() {
+	sed -e '/$(INSTALLDIR)/s,heretic2/h2data,/h2data,' \
+		-i Makefile || die
+}
+
+src_configure() {
+	tc-export CC CXX AR RANLIB
+
+	export TEE_STDERR=""
+
+	# dependencies-check wants gtk
+	if use gtk; then
+		emake dependencies-check
+	fi
+}
+
+src_compile() {
+	emake ${targets// / binaries-}
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)/${PN}
+	doins \
+		setup/data/tools/q3data.qdt
+
+	dodoc ChangeLog ChangeLog.idsoftware CONTRIBUTORS TODO tools/quake3/q3map2/changelog.q3map{1,2.txt}
+
+	pushd install || die
+	exeinto /usr/$(get_libdir)/${PN}
+	for i in ${targets}; do
+		doexe ${i}.x86
+		dosym /usr/$(get_libdir)/${PN}/${i}.x86 /usr/bin/${i}
+	done
+
+	# radiant
+	if use gtk; then
+		dosym /usr/$(get_libdir)/${PN}/radiant.x86 /usr/bin/${PN}
+
+		newicon "${S}"/icons/radiant-src.png ${PN}.png
+		make_desktop_entry ${PN} NetRadiant ${PN} "Development;GTK;"
+
+		# modules
+		insinto /usr/$(get_libdir)/${PN}/modules
+		doins modules/*.so
+
+		# plugins
+		insinto /usr/$(get_libdir)/${PN}/plugins
+		doins plugins/*.so
+
+		# data
+		popd || die
+		echo "$RADIANT_MINOR_VERSION" > RADIANT_MINOR || die
+		echo "$RADIANT_MAJOR_VERSION" > RADIANT_MAJOR || die
+		insinto /usr/$(get_libdir)/${PN}
+		doins -r \
+			RADIANT_MAJOR \
+			RADIANT_MINOR \
+			setup/data/tools/bitmaps \
+			setup/data/tools/gl \
+			setup/data/tools/global.xlink \
+			setup/data/tools/plugins \
+			docs
+
+		# packs
+		for x in ${MY_RADIANT_PACKS//+/}; do
+			if use $x; then
+				cd "${WORKDIR}"/packs/${x} || die
+				# USE and dir names differ
+				n="$(echo $x | sed \
+					-e 's/^quake/q/' \
+					-e 's/^q$/q1/' \
+					-e 's/2world$/2w/' \
+					-e 's/^openarena/oa/' \
+					-e 's/^tremulous/trem/' \
+				)"
+				insinto /usr/$(get_libdir)/${PN}
+				doins -r ${n}.game
+
+				insinto /usr/$(get_libdir)/${PN}/games
+				doins games/${n}.game
+			fi
+		done
+	fi
+}

diff --git a/dev-games/netradiant/netradiant-9999.ebuild b/dev-games/netradiant/netradiant-9999.ebuild
index e5d318e..a040da0 100644
--- a/dev-games/netradiant/netradiant-9999.ebuild
+++ b/dev-games/netradiant/netradiant-9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI="4"
 
+EGIT_NOUNPACK="true"
 ESVN_DISABLE_DEPENDENCIES="true"
 ESVN_OPTIONS="--trust-server-cert --non-interactive"
 



^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: dev-games/netradiant/
@ 2012-06-12  1:23 Nikoli
  0 siblings, 0 replies; 8+ messages in thread
From: Nikoli @ 2012-06-12  1:23 UTC (permalink / raw
  To: gentoo-commits

commit:     4f65418c617e26b4cefc4f73ac1fc87de674f53d
Author:     Nikoli <nikoli <AT> lavabit <DOT> com>
AuthorDate: Tue Jun 12 01:23:40 2012 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Tue Jun 12 01:23:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=4f65418c

netradiant: new snapshot, update gamepacks, remove old

(Portage version: 2.1.10.49/git/Linux x86_64, unsigned Manifest commit)

---
 dev-games/netradiant/ChangeLog                     |    9 +-
 dev-games/netradiant/metadata.xml                  |    3 +-
 .../netradiant/netradiant-1.5.0_p20110127.ebuild   |  181 --------------------
 ...27.ebuild => netradiant-1.5.0_p20120515.ebuild} |   13 +-
 dev-games/netradiant/netradiant-9999.ebuild        |   23 ++--
 5 files changed, 26 insertions(+), 203 deletions(-)

diff --git a/dev-games/netradiant/ChangeLog b/dev-games/netradiant/ChangeLog
index 028a7b1..68830b8 100644
--- a/dev-games/netradiant/ChangeLog
+++ b/dev-games/netradiant/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for dev-games/netradiant
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*netradiant-1.5.0_p20120515 (12 Jun 2012)
+
+  12 Jun 2012; Nikoli <nikoli@lavabit.com> -netradiant-1.5.0_p20110127.ebuild,
+  -netradiant-1.5.0_p20110827.ebuild, +netradiant-1.5.0_p20120515.ebuild,
+  netradiant-9999.ebuild, metadata.xml:
+  new snapshot, update gamepacks, remove old
+
 *netradiant-1.5.0_p20110827 (14 Sep 2011)
 
   14 Sep 2011; Nikoli <nikoli@lavabit.com> +netradiant-1.5.0_p20110827.ebuild,

diff --git a/dev-games/netradiant/metadata.xml b/dev-games/netradiant/metadata.xml
index 754a3d2..46acd34 100644
--- a/dev-games/netradiant/metadata.xml
+++ b/dev-games/netradiant/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
 	<maintainer>
 		<email>nikoli@lavabit.com</email>
 		<name>Nikoli</name>
@@ -16,7 +15,7 @@
 		<flag name='nexuiz'>Install Nexuiz pack</flag>
 		<flag name='openarena'>Install OpenArena non GPL pack</flag>
 		<flag name='osirion'>Install Osirion pack</flag>
-		<flag name='quake'>Install Quake non GPL pack</flag>
+		<flag name='quake1'>Install Quake non GPL pack</flag>
 		<flag name='quake2'>Install Quake2 non GPL pack</flag>
 		<flag name='quake2world'>Install Quake2World pack</flag>
 		<flag name='quake3'>Install Quake3 non GPL pack</flag>

diff --git a/dev-games/netradiant/netradiant-1.5.0_p20110127.ebuild b/dev-games/netradiant/netradiant-1.5.0_p20110127.ebuild
deleted file mode 100644
index 1be2515..0000000
--- a/dev-games/netradiant/netradiant-1.5.0_p20110127.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit eutils multilib toolchain-funcs
-
-RADIANT_MAJOR_VERSION="5"
-RADIANT_MINOR_VERSION="0"
-DESCRIPTION="NetRadiant is a fork of map editor for Q3 based games, GtkRadiant 1.5"
-HOMEPAGE="http://dev.alientrap.org/projects/netradiant"
-BASE_ZIP_URI="http://ingar.satgnu.net/files/gtkradiant/gamepacks/"
-SRC_URI="http://rion-overlay.googlecode.com/files/${P}.tar.xz
-	!bindist? (
-		openarena? ( ${BASE_ZIP_URI}/OpenArenaPack.zip )
-		quake? ( ${BASE_ZIP_URI}/QuakePack.zip )
-		quake2? ( ${BASE_ZIP_URI}/Quake2Pack.zip )
-		tremulous? ( ${BASE_ZIP_URI}/TremulousPack.zip )
-	)
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RADIANT_GPL_PACKS="darkplaces nexuiz quake2world warsow +xonotic"
-RADIANT_NONGPL_PACKS="openarena quake quake2 tremulous"
-RADIANT_TOOLS="h2data q2map q3data q3map2 qdata3"
-RADIANT_PACKS="${RADIANT_GPL_PACKS} ${RADIANT_NONGPL_PACKS}"
-RADIANT_BINS=" ${RADIANT_TOOLS} gtk"
-IUSE="${RADIANT_PACKS} ${RADIANT_BINS// / +} bindist"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2
-	>=media-libs/libpng-1.2
-	>=sys-libs/zlib-1.2
-	gtk? (
-		>=x11-libs/gtk+-2.4:2
-		>=x11-libs/gtkglext-1
-		x11-libs/pango
-	)
-	!dev-games/gtkradiant
-"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	dev-util/pkgconfig
-	!bindist? (
-		openarena? ( app-arch/unzip )
-		quake? ( app-arch/unzip )
-		quake2? ( app-arch/unzip )
-		tremulous? ( app-arch/unzip )
-	)
-"
-
-radiant_zip_unpack() {
-		if use ${1,,}; then
-			cd "${WORKDIR}/packs/" || die
-			unpack "${1}Pack.zip"
-			mv ${1}Pack ${1,,} || die
-		fi
-}
-
-pkg_setup() {
-	targets=""
-	for i in ${RADIANT_BINS};do
-		if use $i; then
-			targets+=" ${i/gtk/radiant}"
-		fi
-	done
-	if [ "x$targets" = "x" ]; then
-		targets=" q3map2"
-		ewarn "You disabled all binaries: defaulting to USE=\"q3map2\""
-	fi
-}
-
-src_unpack() {
-	unpack ${P}.tar.xz
-
-	if use gtk; then
-		if use !bindist; then
-			MY_RADIANT_PACKS="${RADIANT_GPL_PACKS//+/} ${RADIANT_NONGPL_PACKS}"
-			radiant_zip_unpack OpenArena
-			radiant_zip_unpack Quake
-			radiant_zip_unpack Quake2
-			radiant_zip_unpack Tremulous
-		else
-			MY_RADIANT_PACKS="${RADIANT_GPL_PACKS//+/}"
-			for i in ${RADIANT_NONGPL_PACKS}; do
-				if use ${i}; then
-					ewarn "USE bindist disables ${i} non GPL pack"
-				fi
-			done
-		fi
-	fi
-}
-
-src_prepare() {
-	sed -e '/$(INSTALLDIR)/s,heretic2/h2data,/h2data,' \
-		-i Makefile || die
-}
-
-src_configure() {
-	tc-export CC CXX AR RANLIB
-
-	export TEE_STDERR=""
-
-	# dependencies-check wants gtk
-	if use gtk; then
-		emake dependencies-check
-	fi
-}
-
-src_compile() {
-	emake ${targets// / binaries-}
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/${PN}
-	doins \
-		setup/data/tools/q3data.qdt
-
-	dodoc ChangeLog ChangeLog.idsoftware CONTRIBUTORS TODO tools/quake3/q3map2/changelog.q3map{1,2.txt}
-
-	pushd install || die
-	exeinto /usr/$(get_libdir)/${PN}
-	for i in ${targets}; do
-		doexe ${i}.x86
-		dosym /usr/$(get_libdir)/${PN}/${i}.x86 /usr/bin/${i}
-	done
-
-	# radiant
-	if use gtk; then
-		dosym /usr/$(get_libdir)/${PN}/radiant.x86 /usr/bin/${PN}
-
-		newicon "${S}"/icons/radiant-src.png ${PN}.png
-		make_desktop_entry ${PN} NetRadiant ${PN} "Development;GTK;"
-
-		# modules
-		insinto /usr/$(get_libdir)/${PN}/modules
-		doins modules/*.so
-
-		# plugins
-		insinto /usr/$(get_libdir)/${PN}/plugins
-		doins plugins/*.so
-
-		# data
-		popd || die
-		echo "$RADIANT_MINOR_VERSION" > RADIANT_MINOR || die
-		echo "$RADIANT_MAJOR_VERSION" > RADIANT_MAJOR || die
-		insinto /usr/$(get_libdir)/${PN}
-		doins -r \
-			RADIANT_MAJOR \
-			RADIANT_MINOR \
-			setup/data/tools/bitmaps \
-			setup/data/tools/gl \
-			setup/data/tools/global.xlink \
-			setup/data/tools/plugins \
-			docs
-
-		# packs
-		for x in ${MY_RADIANT_PACKS//+/}; do
-			if use $x; then
-				cd "${WORKDIR}"/packs/${x} || die
-				# USE and dir names differ
-				n="$(echo $x | sed \
-					-e 's/^quake/q/' \
-					-e 's/^q$/q1/' \
-					-e 's/2world$/2w/' \
-					-e 's/^openarena/oa/' \
-					-e 's/^tremulous/trem/' \
-				)"
-				insinto /usr/$(get_libdir)/${PN}
-				doins -r ${n}.game
-
-				insinto /usr/$(get_libdir)/${PN}/games
-				doins games/${n}.game
-			fi
-		done
-	fi
-}

diff --git a/dev-games/netradiant/netradiant-1.5.0_p20110827.ebuild b/dev-games/netradiant/netradiant-1.5.0_p20120515.ebuild
similarity index 92%
rename from dev-games/netradiant/netradiant-1.5.0_p20110827.ebuild
rename to dev-games/netradiant/netradiant-1.5.0_p20120515.ebuild
index ceb818d..5732d51 100644
--- a/dev-games/netradiant/netradiant-1.5.0_p20110827.ebuild
+++ b/dev-games/netradiant/netradiant-1.5.0_p20120515.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -13,10 +13,10 @@ HOMEPAGE="http://dev.alientrap.org/projects/netradiant"
 BASE_ZIP_URI="http://ingar.satgnu.net/files/gtkradiant/gamepacks/"
 SRC_URI="http://rion-overlay.googlecode.com/files/${P}.tar.xz
 	osirion? ( ${BASE_ZIP_URI}/OsirionPack.zip )
+	quake1? ( ${BASE_ZIP_URI}/Quake1Pack.zip )
 	warsow? ( ${BASE_ZIP_URI}/WarsowPack.zip )
 	!bindist? (
 		openarena? ( ${BASE_ZIP_URI}/OpenArenaPack.zip )
-		quake? ( ${BASE_ZIP_URI}/QuakePack.zip )
 		quake2? ( ${BASE_ZIP_URI}/Quake2Pack.zip )
 		tremulous? ( ${BASE_ZIP_URI}/TremulousPack.zip )
 	)
@@ -26,7 +26,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RADIANT_GPL_PACKS="darkplaces nexuiz osirion quake2world warsow +xonotic"
-RADIANT_NONGPL_PACKS="openarena quake quake2 tremulous"
+RADIANT_NONGPL_PACKS="openarena quake1 quake2 tremulous"
 RADIANT_TOOLS="h2data q2map q3data q3map2 qdata3"
 RADIANT_PACKS="${RADIANT_GPL_PACKS} ${RADIANT_NONGPL_PACKS}"
 RADIANT_BINS=" ${RADIANT_TOOLS} gtk"
@@ -48,10 +48,10 @@ DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	dev-util/pkgconfig
 	osirion? ( app-arch/unzip )
+	quake1? ( app-arch/unzip )
 	warsow? ( app-arch/unzip )
 	!bindist? (
 		openarena? ( app-arch/unzip )
-		quake? ( app-arch/unzip )
 		quake2? ( app-arch/unzip )
 		tremulous? ( app-arch/unzip )
 	)
@@ -83,12 +83,12 @@ src_unpack() {
 
 	if use gtk; then
 		radiant_zip_unpack Osirion
+		radiant_zip_unpack Quake1
 		radiant_zip_unpack Warsow
 
 		if use !bindist; then
 			MY_RADIANT_PACKS="${RADIANT_GPL_PACKS//+/} ${RADIANT_NONGPL_PACKS}"
 			radiant_zip_unpack OpenArena
-			radiant_zip_unpack Quake
 			radiant_zip_unpack Quake2
 			radiant_zip_unpack Tremulous
 		else
@@ -127,7 +127,7 @@ src_install() {
 	doins \
 		setup/data/tools/q3data.qdt
 
-	dodoc ChangeLog ChangeLog.idsoftware CONTRIBUTORS TODO tools/quake3/q3map2/changelog.q3map{1,2.txt}
+	dodoc ChangeLog ChangeLog.idsoftware CONTRIBUTORS tools/quake3/q3map2/changelog.q3map{1,2.txt}
 
 	pushd install || die
 	exeinto /usr/$(get_libdir)/${PN}
@@ -172,7 +172,6 @@ src_install() {
 				# USE and dir names differ
 				n="$(echo $x | sed \
 					-e 's/^quake/q/' \
-					-e 's/^q$/q1/' \
 					-e 's/2world$/2w/' \
 					-e 's/^openarena/oa/' \
 					-e 's/^tremulous/trem/' \

diff --git a/dev-games/netradiant/netradiant-9999.ebuild b/dev-games/netradiant/netradiant-9999.ebuild
index a040da0..725a9b2 100644
--- a/dev-games/netradiant/netradiant-9999.ebuild
+++ b/dev-games/netradiant/netradiant-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -18,10 +18,10 @@ EGIT_REPO_URI="git://git.xonotic.org/xonotic/netradiant.git"
 BASE_ZIP_URI="http://ingar.satgnu.net/files/gtkradiant/gamepacks/"
 SRC_URI="
 	osirion? ( ${BASE_ZIP_URI}/OsirionPack.zip )
+	quake1? ( ${BASE_ZIP_URI}/Quake1Pack.zip )
 	warsow? ( ${BASE_ZIP_URI}/WarsowPack.zip )
 	!bindist? (
 		openarena? ( ${BASE_ZIP_URI}/OpenArenaPack.zip )
-		quake? ( ${BASE_ZIP_URI}/QuakePack.zip )
 		quake2? ( ${BASE_ZIP_URI}/Quake2Pack.zip )
 		tremulous? ( ${BASE_ZIP_URI}/TremulousPack.zip )
 	)
@@ -30,8 +30,8 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-RADIANT_GPL_PACKS="darkplaces nexuiz osirion quake2world warsow +xonotic"
-RADIANT_NONGPL_PACKS="openarena quake quake2 quake3 tremulous ufoai"
+RADIANT_GPL_PACKS="darkplaces nexuiz osirion quake1 quake2world warsow +xonotic"
+RADIANT_NONGPL_PACKS="openarena quake2 quake3 tremulous ufoai"
 RADIANT_TOOLS="h2data q2map q3data q3map2 qdata3"
 RADIANT_PACKS="${RADIANT_GPL_PACKS} ${RADIANT_NONGPL_PACKS}"
 RADIANT_BINS=" ${RADIANT_TOOLS} gtk"
@@ -53,12 +53,12 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	darkplaces? ( ${SUBVERSION_DEPEND} )
 	osirion? ( app-arch/unzip )
+	quake1? ( app-arch/unzip )
 	quake2world? ( ${SUBVERSION_DEPEND} )
 	warsow? ( app-arch/unzip )
 	xonotic? ( net-misc/wget )
 	!bindist? (
 		openarena? ( app-arch/unzip )
-		quake? ( app-arch/unzip )
 		quake2? ( app-arch/unzip )
 		quake3? ( ${SUBVERSION_DEPEND} )
 		tremulous? ( app-arch/unzip )
@@ -105,10 +105,11 @@ src_unpack() {
 		mkdir "${WORKDIR}/packs/" || die
 
 		radiant_svn_unpack darkplaces \
-			"https://zerowing.idsoftware.com/svn/radiant.gamepacks/DarkPlacesPack/branches/1.5/"
+			"svn://svn.icculus.org/gtkradiant-gamepacks/DarkPlacesPack/branches/1.5/"
 		radiant_svn_unpack quake2world \
 			"svn://jdolan.dyndns.org/quake2world/trunk/gtkradiant"
 		radiant_zip_unpack Osirion
+		radiant_zip_unpack Quake1
 		radiant_zip_unpack Warsow
 
 		if use nexuiz; then
@@ -123,7 +124,7 @@ src_unpack() {
 		fi
 
 		if use xonotic; then
-			unset EGIT_MASTER EGIT_BRANCH EGIT_COMMIT EGIT_PROJECT EGIT_DIR
+			unset EGIT_MASTER EGIT_BRANCH EGIT_COMMIT EGIT_PROJECT
 			EGIT_REPO_URI="git://git.xonotic.org/xonotic/netradiant-xonoticpack.git" \
 			EGIT_PROJECT="${PN}-xonotic" \
 			EGIT_SOURCEDIR="${WORKDIR}/packs/xonotic" \
@@ -140,15 +141,14 @@ src_unpack() {
 		if use !bindist; then
 			MY_RADIANT_PACKS="${RADIANT_GPL_PACKS//+/} ${RADIANT_NONGPL_PACKS}"
 			radiant_svn_unpack ufoai \
-				"https://zerowing.idsoftware.com/svn/radiant.gamepacks/UFOAIPack/branches/1.5/"
+				"svn://svn.icculus.org/gtkradiant-gamepacks/UFOAIPack/branches/1.5/"
 
 			radiant_zip_unpack OpenArena
-			radiant_zip_unpack Quake
 			radiant_zip_unpack Quake2
 			radiant_zip_unpack Tremulous
 
 			if use quake3; then
-				ESVN_REPO_URI="https://zerowing.idsoftware.com/svn/radiant.gamepacks/Q3Pack/trunk/" \
+				ESVN_REPO_URI="svn://svn.icculus.org/gtkradiant-gamepacks/Q3Pack/trunk/" \
 				ESVN_PROJECT="${PN}-quake3" \
 				ESVN_REVISION="29" \
 				S="${WORKDIR}/packs/quake3-tmp" \
@@ -193,7 +193,7 @@ src_install() {
 	doins \
 		setup/data/tools/q3data.qdt
 
-	dodoc ChangeLog ChangeLog.idsoftware CONTRIBUTORS TODO tools/quake3/q3map2/changelog.q3map{1,2.txt}
+	dodoc ChangeLog ChangeLog.idsoftware CONTRIBUTORS tools/quake3/q3map2/changelog.q3map{1,2.txt}
 
 	pushd install || die
 	exeinto /usr/$(get_libdir)/${PN}
@@ -238,7 +238,6 @@ src_install() {
 				# USE and dir names differ
 				n="$(echo $x | sed \
 					-e 's/^quake/q/' \
-					-e 's/^q$/q1/' \
 					-e 's/2world$/2w/' \
 					-e 's/^openarena/oa/' \
 					-e 's/^tremulous/trem/' \



^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: dev-games/netradiant/
@ 2012-10-16 15:45 Marcel Unbehaun
  0 siblings, 0 replies; 8+ messages in thread
From: Marcel Unbehaun @ 2012-10-16 15:45 UTC (permalink / raw
  To: gentoo-commits

commit:     7a9357d74074793431dc52ae802fbd735171bdc0
Author:     Marcel Unbehaun <marcel <AT> frostworx <DOT> de>
AuthorDate: Tue Oct 16 15:49:10 2012 +0000
Commit:     Marcel Unbehaun <frostworks <AT> gmx <DOT> de>
CommitDate: Tue Oct 16 15:49:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=7a9357d7

[dev-games/netradiant]	added depend on subversion

---
 .../netradiant/netradiant-1.5.0_p20120515.ebuild   |    1 +
 dev-games/netradiant/netradiant-9999.ebuild        |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/dev-games/netradiant/netradiant-1.5.0_p20120515.ebuild b/dev-games/netradiant/netradiant-1.5.0_p20120515.ebuild
index 5732d51..5c5ef34 100644
--- a/dev-games/netradiant/netradiant-1.5.0_p20120515.ebuild
+++ b/dev-games/netradiant/netradiant-1.5.0_p20120515.ebuild
@@ -47,6 +47,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
 	dev-util/pkgconfig
+	dev-vcs/subversion
 	osirion? ( app-arch/unzip )
 	quake1? ( app-arch/unzip )
 	warsow? ( app-arch/unzip )

diff --git a/dev-games/netradiant/netradiant-9999.ebuild b/dev-games/netradiant/netradiant-9999.ebuild
index 725a9b2..5ef3fb5 100644
--- a/dev-games/netradiant/netradiant-9999.ebuild
+++ b/dev-games/netradiant/netradiant-9999.ebuild
@@ -51,6 +51,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
+	dev-vcs/subversion
 	darkplaces? ( ${SUBVERSION_DEPEND} )
 	osirion? ( app-arch/unzip )
 	quake1? ( app-arch/unzip )


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: dev-games/netradiant/
@ 2012-11-08 13:55 Michael Palimaka
  0 siblings, 0 replies; 8+ messages in thread
From: Michael Palimaka @ 2012-11-08 13:55 UTC (permalink / raw
  To: gentoo-commits

commit:     616e3d570772429eb14b1d9a4cc47ba312e9a583
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  8 13:53:17 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Nov  8 13:53:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=616e3d57

[dev-games/netradiant] Migrate to virtual/pkgconfig. Drop obsolete ${SUBVERSION_DEPEND}.

Package-Manager: portage-2.1.11.31
Manifest-Sign-Key: 675D0D2C

---
 dev-games/netradiant/ChangeLog                     |    4 ++++
 .../netradiant/netradiant-1.5.0_p20120515.ebuild   |    2 +-
 dev-games/netradiant/netradiant-9999.ebuild        |    6 +-----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-games/netradiant/ChangeLog b/dev-games/netradiant/ChangeLog
index de11190..ee11487 100644
--- a/dev-games/netradiant/ChangeLog
+++ b/dev-games/netradiant/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Nov 2012; Michael Palimaka <kensington@gentoo.org>
+  netradiant-1.5.0_p20120515.ebuild, netradiant-9999.ebuild:
+  Migrate to virtual/pkgconfig. Drop obsolete .
+
   16 Oct 2012; Marcel Unbehaun <marcel@frostworx.de>
   netradiant-1.5.0_p20120515.ebuild, netradiant-9999.ebuild:
   added depend on subversion

diff --git a/dev-games/netradiant/netradiant-1.5.0_p20120515.ebuild b/dev-games/netradiant/netradiant-1.5.0_p20120515.ebuild
index 5c5ef34..7a6c800 100644
--- a/dev-games/netradiant/netradiant-1.5.0_p20120515.ebuild
+++ b/dev-games/netradiant/netradiant-1.5.0_p20120515.ebuild
@@ -46,8 +46,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	app-arch/xz-utils
-	dev-util/pkgconfig
 	dev-vcs/subversion
+	virtual/pkgconfig
 	osirion? ( app-arch/unzip )
 	quake1? ( app-arch/unzip )
 	warsow? ( app-arch/unzip )

diff --git a/dev-games/netradiant/netradiant-9999.ebuild b/dev-games/netradiant/netradiant-9999.ebuild
index 5ef3fb5..9c2588d 100644
--- a/dev-games/netradiant/netradiant-9999.ebuild
+++ b/dev-games/netradiant/netradiant-9999.ebuild
@@ -50,20 +50,16 @@ RDEPEND="
 	!dev-games/gtkradiant
 "
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
 	dev-vcs/subversion
-	darkplaces? ( ${SUBVERSION_DEPEND} )
+	virtual/pkgconfig
 	osirion? ( app-arch/unzip )
 	quake1? ( app-arch/unzip )
-	quake2world? ( ${SUBVERSION_DEPEND} )
 	warsow? ( app-arch/unzip )
 	xonotic? ( net-misc/wget )
 	!bindist? (
 		openarena? ( app-arch/unzip )
 		quake2? ( app-arch/unzip )
-		quake3? ( ${SUBVERSION_DEPEND} )
 		tremulous? ( app-arch/unzip )
-		ufoai? ( ${SUBVERSION_DEPEND} )
 	)
 "
 WGET="/usr/bin/wget -t 3 -T 60"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: dev-games/netradiant/
@ 2018-11-10 23:44 Azamat H. Hackimov
  0 siblings, 0 replies; 8+ messages in thread
From: Azamat H. Hackimov @ 2018-11-10 23:44 UTC (permalink / raw
  To: gentoo-commits

commit:     ad731d773590dce045bd55356311a5d1552ccf9a
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Sat Nov 10 20:57:29 2018 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Sat Nov 10 23:44:20 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=ad731d77

dev-games/netradiant: minor fixes in package

Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 dev-games/netradiant/metadata.xml                      | 2 +-
 dev-games/netradiant/netradiant-1.5.0_p20120515.ebuild | 5 ++---
 dev-games/netradiant/netradiant-9999.ebuild            | 5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/dev-games/netradiant/metadata.xml b/dev-games/netradiant/metadata.xml
index 46acd34..b9a2cb3 100644
--- a/dev-games/netradiant/metadata.xml
+++ b/dev-games/netradiant/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>nikoli@lavabit.com</email>
 		<name>Nikoli</name>
 	</maintainer>

diff --git a/dev-games/netradiant/netradiant-1.5.0_p20120515.ebuild b/dev-games/netradiant/netradiant-1.5.0_p20120515.ebuild
index 7a6c800..94d841c 100644
--- a/dev-games/netradiant/netradiant-1.5.0_p20120515.ebuild
+++ b/dev-games/netradiant/netradiant-1.5.0_p20120515.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI="4"
+EAPI=4
 
 inherit eutils multilib toolchain-funcs
 

diff --git a/dev-games/netradiant/netradiant-9999.ebuild b/dev-games/netradiant/netradiant-9999.ebuild
index 9c2588d..ee621d1 100644
--- a/dev-games/netradiant/netradiant-9999.ebuild
+++ b/dev-games/netradiant/netradiant-9999.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI="4"
+EAPI=4
 
 EGIT_NOUNPACK="true"
 ESVN_DISABLE_DEPENDENCIES="true"


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] proj/gamerlay:master commit in: dev-games/netradiant/
@ 2020-02-10 18:11 Azamat H. Hackimov
  0 siblings, 0 replies; 8+ messages in thread
From: Azamat H. Hackimov @ 2020-02-10 18:11 UTC (permalink / raw
  To: gentoo-commits

commit:     6c9be387d23070ad14e4aad6feac79cfa58f9ee7
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Mon Feb 10 18:03:04 2020 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Mon Feb 10 18:11:13 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=6c9be387

dev-games/netradiant: remove live version

Cannot build, deprecated eclass

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>

 dev-games/netradiant/metadata.xml           |   2 -
 dev-games/netradiant/netradiant-9999.ebuild | 254 ----------------------------
 2 files changed, 256 deletions(-)

diff --git a/dev-games/netradiant/metadata.xml b/dev-games/netradiant/metadata.xml
index b9a2cb3..2354e25 100644
--- a/dev-games/netradiant/metadata.xml
+++ b/dev-games/netradiant/metadata.xml
@@ -18,9 +18,7 @@
 		<flag name='quake1'>Install Quake non GPL pack</flag>
 		<flag name='quake2'>Install Quake2 non GPL pack</flag>
 		<flag name='quake2world'>Install Quake2World pack</flag>
-		<flag name='quake3'>Install Quake3 non GPL pack</flag>
 		<flag name='tremulous'>Install Tremulous non GPL pack</flag>
-		<flag name='ufoai'>Install UFO: Alien Invasion non GPL pack</flag>
 		<flag name='warsow'>Install Warsow pack</flag>
 		<flag name='xonotic'>Install Xonotic pack</flag>
 	</use>

diff --git a/dev-games/netradiant/netradiant-9999.ebuild b/dev-games/netradiant/netradiant-9999.ebuild
deleted file mode 100644
index ee621d1..0000000
--- a/dev-games/netradiant/netradiant-9999.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-EGIT_NOUNPACK="true"
-ESVN_DISABLE_DEPENDENCIES="true"
-ESVN_OPTIONS="--trust-server-cert --non-interactive"
-
-inherit eutils multilib toolchain-funcs subversion git-2
-
-RADIANT_MAJOR_VERSION="5"
-RADIANT_MINOR_VERSION="0"
-DESCRIPTION="NetRadiant is a fork of map editor for Q3 based games, GtkRadiant 1.5"
-HOMEPAGE="http://dev.alientrap.org/projects/netradiant"
-EGIT_REPO_URI="git://git.xonotic.org/xonotic/netradiant.git"
-BASE_ZIP_URI="http://ingar.satgnu.net/files/gtkradiant/gamepacks/"
-SRC_URI="
-	osirion? ( ${BASE_ZIP_URI}/OsirionPack.zip )
-	quake1? ( ${BASE_ZIP_URI}/Quake1Pack.zip )
-	warsow? ( ${BASE_ZIP_URI}/WarsowPack.zip )
-	!bindist? (
-		openarena? ( ${BASE_ZIP_URI}/OpenArenaPack.zip )
-		quake2? ( ${BASE_ZIP_URI}/Quake2Pack.zip )
-		tremulous? ( ${BASE_ZIP_URI}/TremulousPack.zip )
-	)
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-RADIANT_GPL_PACKS="darkplaces nexuiz osirion quake1 quake2world warsow +xonotic"
-RADIANT_NONGPL_PACKS="openarena quake2 quake3 tremulous ufoai"
-RADIANT_TOOLS="h2data q2map q3data q3map2 qdata3"
-RADIANT_PACKS="${RADIANT_GPL_PACKS} ${RADIANT_NONGPL_PACKS}"
-RADIANT_BINS=" ${RADIANT_TOOLS} gtk"
-IUSE="${RADIANT_PACKS} ${RADIANT_BINS// / +} bindist"
-
-RDEPEND="
-	dev-libs/glib:2
-	dev-libs/libxml2
-	>=media-libs/libpng-1.2
-	>=sys-libs/zlib-1.2
-	gtk? (
-		>=x11-libs/gtk+-2.4:2
-		>=x11-libs/gtkglext-1
-		x11-libs/pango
-	)
-	!dev-games/gtkradiant
-"
-DEPEND="${RDEPEND}
-	dev-vcs/subversion
-	virtual/pkgconfig
-	osirion? ( app-arch/unzip )
-	quake1? ( app-arch/unzip )
-	warsow? ( app-arch/unzip )
-	xonotic? ( net-misc/wget )
-	!bindist? (
-		openarena? ( app-arch/unzip )
-		quake2? ( app-arch/unzip )
-		tremulous? ( app-arch/unzip )
-	)
-"
-WGET="/usr/bin/wget -t 3 -T 60"
-
-radiant_svn_unpack() {
-	if use ${1}; then
-		cd "${WORKDIR}/packs/" || die
-		ESVN_REPO_URI="${2}" \
-		ESVN_PROJECT="${PN}-${1}" \
-		S="${WORKDIR}/packs/${1}" \
-		subversion_fetch
-	fi
-}
-
-radiant_zip_unpack() {
-		if use ${1,,}; then
-			cd "${WORKDIR}/packs/" || die
-			unpack "${1}Pack.zip"
-			mv ${1}Pack ${1,,} || die
-		fi
-}
-
-pkg_setup() {
-	targets=""
-	for i in ${RADIANT_BINS};do
-		if use $i; then
-			targets+=" ${i/gtk/radiant}"
-		fi
-	done
-	if [ "x$targets" = "x" ]; then
-		targets=" q3map2"
-		ewarn "You disabled all binaries: defaulting to USE=\"q3map2\""
-	fi
-}
-
-src_unpack() {
-	git-2_src_unpack
-
-	if use gtk; then
-		mkdir "${WORKDIR}/packs/" || die
-
-		radiant_svn_unpack darkplaces \
-			"svn://svn.icculus.org/gtkradiant-gamepacks/DarkPlacesPack/branches/1.5/"
-		radiant_svn_unpack quake2world \
-			"svn://jdolan.dyndns.org/quake2world/trunk/gtkradiant"
-		radiant_zip_unpack Osirion
-		radiant_zip_unpack Quake1
-		radiant_zip_unpack Warsow
-
-		if use nexuiz; then
-			cd "${WORKDIR}/packs/" || die
-			ewarn "Using \"git archive\" directly for downloading from http://git.xonotic.org/"
-			ewarn "This might be potential security risk, make sure that you know what you are doing"
-			git archive \
-				--remote="git://git.icculus.org/divverent/nexuiz.git" \
-				--prefix="nexuiz/" \
-				master:misc/netradiant-NexuizPack \
-				| tar xvf - 2>/dev/null || die
-		fi
-
-		if use xonotic; then
-			unset EGIT_MASTER EGIT_BRANCH EGIT_COMMIT EGIT_PROJECT
-			EGIT_REPO_URI="git://git.xonotic.org/xonotic/netradiant-xonoticpack.git" \
-			EGIT_PROJECT="${PN}-xonotic" \
-			EGIT_SOURCEDIR="${WORKDIR}/packs/xonotic" \
-			git-2_src_unpack
-
-			cd "${WORKDIR}/packs/xonotic" || die
-			ewarn "Using \"wget\" directly for downloading from http://git.xonotic.org/"
-			ewarn "This might be potential security risk, make sure that you know what you are doing"
-			while IFS="	" read -r FILE URL; do
-				$WGET -O "$FILE" "$URL" || die
-			done < "extra-urls.txt"
-		fi
-
-		if use !bindist; then
-			MY_RADIANT_PACKS="${RADIANT_GPL_PACKS//+/} ${RADIANT_NONGPL_PACKS}"
-			radiant_svn_unpack ufoai \
-				"svn://svn.icculus.org/gtkradiant-gamepacks/UFOAIPack/branches/1.5/"
-
-			radiant_zip_unpack OpenArena
-			radiant_zip_unpack Quake2
-			radiant_zip_unpack Tremulous
-
-			if use quake3; then
-				ESVN_REPO_URI="svn://svn.icculus.org/gtkradiant-gamepacks/Q3Pack/trunk/" \
-				ESVN_PROJECT="${PN}-quake3" \
-				ESVN_REVISION="29" \
-				S="${WORKDIR}/packs/quake3-tmp" \
-				subversion_fetch
-				cd "${WORKDIR}/packs/" || die
-				mv quake3-tmp/tools quake3 || die
-				rm -rf quake3-tmp || die
-			fi
-		else
-			MY_RADIANT_PACKS="${RADIANT_GPL_PACKS//+/}"
-			for i in ${RADIANT_NONGPL_PACKS}; do
-				if use ${i}; then
-					ewarn "USE bindist disables ${i} non GPL pack"
-				fi
-			done
-		fi
-	fi
-}
-
-src_prepare() {
-	sed -e '/$(INSTALLDIR)/s,heretic2/h2data,/h2data,' \
-		-i Makefile || die
-}
-
-src_configure() {
-	tc-export CC CXX AR RANLIB
-
-	export TEE_STDERR=""
-
-	# dependencies-check wants gtk
-	if use gtk; then
-		emake dependencies-check
-	fi
-}
-
-src_compile() {
-	emake ${targets// / binaries-}
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/${PN}
-	doins \
-		setup/data/tools/q3data.qdt
-
-	dodoc ChangeLog ChangeLog.idsoftware CONTRIBUTORS tools/quake3/q3map2/changelog.q3map{1,2.txt}
-
-	pushd install || die
-	exeinto /usr/$(get_libdir)/${PN}
-	for i in ${targets}; do
-		doexe ${i}.x86
-		dosym /usr/$(get_libdir)/${PN}/${i}.x86 /usr/bin/${i}
-	done
-
-	# radiant
-	if use gtk; then
-		dosym /usr/$(get_libdir)/${PN}/radiant.x86 /usr/bin/${PN}
-
-		newicon "${S}"/icons/radiant-src.png ${PN}.png
-		make_desktop_entry ${PN} NetRadiant ${PN} "Development;GTK;"
-
-		# modules
-		insinto /usr/$(get_libdir)/${PN}/modules
-		doins modules/*.so
-
-		# plugins
-		insinto /usr/$(get_libdir)/${PN}/plugins
-		doins plugins/*.so
-
-		# data
-		popd || die
-		echo "$RADIANT_MINOR_VERSION" > RADIANT_MINOR || die
-		echo "$RADIANT_MAJOR_VERSION" > RADIANT_MAJOR || die
-		insinto /usr/$(get_libdir)/${PN}
-		doins -r \
-			RADIANT_MAJOR \
-			RADIANT_MINOR \
-			setup/data/tools/bitmaps \
-			setup/data/tools/gl \
-			setup/data/tools/global.xlink \
-			setup/data/tools/plugins \
-			docs
-
-		# packs
-		for x in ${MY_RADIANT_PACKS//+/}; do
-			if use $x; then
-				cd "${WORKDIR}"/packs/${x} || die
-				# USE and dir names differ
-				n="$(echo $x | sed \
-					-e 's/^quake/q/' \
-					-e 's/2world$/2w/' \
-					-e 's/^openarena/oa/' \
-					-e 's/^tremulous/trem/' \
-				)"
-				insinto /usr/$(get_libdir)/${PN}
-				doins -r ${n}.game
-
-				insinto /usr/$(get_libdir)/${PN}/games
-				doins games/${n}.game
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# subversion_pkg_preinst seems broken
-	true
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-02-10 18:11 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-10 23:44 [gentoo-commits] proj/gamerlay:master commit in: dev-games/netradiant/ Azamat H. Hackimov
  -- strict thread matches above, loose matches on Subject: below --
2020-02-10 18:11 Azamat H. Hackimov
2012-11-08 13:55 Michael Palimaka
2012-10-16 15:45 Marcel Unbehaun
2012-06-12  1:23 Nikoli
2011-09-14 15:02 Nikoli
2011-07-05 22:26 Nikoli
2011-02-26 22:52 Nikoli

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox