[gentoo-commits] proj/gamerlay:master commit in: games-fps/redeclipse/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Michael Weber" <xmw@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gamerlay:master commit in: games-fps/redeclipse/
Date: Sat, 12 May 2012 11:50:36 +0000 (UTC)	[thread overview]
Message-ID: <1336823417.1a20ac20e2e643c3d23c672c84690a751ddab97c.xmw@gentoo> (raw)

commit:     1a20ac20e2e643c3d23c672c84690a751ddab97c
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Sat May 12 11:50:17 2012 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Sat May 12 11:50:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=1a20ac20

[games-fps/redeclipse] Version bump (as suggested by Ian Stakenvicius on bug 363413), respect LDFLAGS

(Portage version: 2.1.10.49/git/Linux x86_64, signed Manifest commit with key 62EEF090)

---
 games-fps/redeclipse/ChangeLog                     |   11 ++++++
 games-fps/redeclipse/redeclipse-1.1.ebuild         |    4 +-
 ...redeclipse-1.1.ebuild => redeclipse-1.2.ebuild} |   33 ++++++++++++-------
 3 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/games-fps/redeclipse/ChangeLog b/games-fps/redeclipse/ChangeLog
new file mode 100644
index 0000000..f120819
--- /dev/null
+++ b/games-fps/redeclipse/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for games-fps/redeclipse
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*redeclipse-1.2 (12 May 2012)
+
+  12 May 2012; Michael Weber <xmw@gentoo.org> redeclipse-1.1.ebuild,
+  +redeclipse-1.2.ebuild:
+  Version bump (as suggested by Ian Stakenvicius on bug 363413), respect
+  LDFLAGS
+

diff --git a/games-fps/redeclipse/redeclipse-1.1.ebuild b/games-fps/redeclipse/redeclipse-1.1.ebuild
index 59ff1a0..d934cb1 100644
--- a/games-fps/redeclipse/redeclipse-1.1.ebuild
+++ b/games-fps/redeclipse/redeclipse-1.1.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: $
 
@@ -8,7 +8,7 @@ inherit games
 
 DESCRIPTION="First-person ego-shooter, built as a total conversion of Cube Engine 2"
 HOMEPAGE="http://www.redeclipse.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_linux_bsd.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}/${PN}_${PV}_linux_bsd.tar.bz2"
 
 # According to license.txt file
 LICENSE="as-is ZLIB CCPL-Attribution-ShareAlike-3.0"

diff --git a/games-fps/redeclipse/redeclipse-1.1.ebuild b/games-fps/redeclipse/redeclipse-1.2.ebuild
similarity index 57%
copy from games-fps/redeclipse/redeclipse-1.1.ebuild
copy to games-fps/redeclipse/redeclipse-1.2.ebuild
index 59ff1a0..0a199cd 100644
--- a/games-fps/redeclipse/redeclipse-1.1.ebuild
+++ b/games-fps/redeclipse/redeclipse-1.2.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: $
 
@@ -8,7 +8,8 @@ inherit games
 
 DESCRIPTION="First-person ego-shooter, built as a total conversion of Cube Engine 2"
 HOMEPAGE="http://www.redeclipse.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_linux_bsd.tar.bz2"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}/${PN}_${PV}_linux_bsd.tar.bz2
+	http://sourceforge.net/apps/trac/redeclipse/export/3683/src/site/bits/favicon.png -> ${P}-favicon.png"
 
 # According to license.txt file
 LICENSE="as-is ZLIB CCPL-Attribution-ShareAlike-3.0"
@@ -24,33 +25,41 @@ DEPEND="!dedicated? (
 		x11-libs/libX11
 	)
 	net-libs/enet:1.3
-	sys-libs/zlib
-"
+	sys-libs/zlib"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}"/${PN}
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack $A
+	einfo "Copying favicon.png into ${WORKDIR}"
+	cp "${DISTDIR}"/${P}-favicon.png "${WORKDIR}/favicon.png" || die
+}
 
 src_prepare() {
 	# Respect GAMES_DATADIR
 	sed -i -e "s:\(addpackagedir(\"\)data:\1${GAMES_DATADIR}/${PN}/data:" \
-		src/engine/server.cpp || die "sed failed"
+		src/engine/server.cpp || die
 
 	# Unbundle enet
 	sed -i \
 		-e "s:\(client\)\: libenet:\1\::" \
 		-e   "s:\(server\)\: libenet:\1\::" \
-		src/Makefile || die "sed failed"
+		src/Makefile || die
+	rm -r src/enet || die
 
-	# Remove strip
-	sed -i "/STRIP=strip/d" src/Makefile || die "sed failed"
+	#respect LDFLAGS
+	sed -e "/^client/,+1s:-o reclient:-o reclient \$(LDFLAGS):" \
+		-e "/^server/,+1s:-o reserver:-o reserver \$(LDFLAGS):" \
+		-i src/Makefile || die
 }
 
 src_compile() {
 	cd src
 	if ! use dedicated ; then
-		emake CXXFLAGS="${CXXFLAGS}" client server || die "Make failed"
+		emake CXXFLAGS="${CXXFLAGS}" STRIP= client server || die "Make failed"
 	else
-		emake CXXFLAGS="${CXXFLAGS}" server
+		emake CXXFLAGS="${CXXFLAGS}" STRIPT= server
 	fi
 }
 
@@ -61,7 +70,7 @@ src_install() {
 		newgamesbin src/reclient ${PN} || die
 		insinto "${GAMES_DATADIR}"/${PN}
 		doins -r data
-		newicon src/site/bits/favicon.png ${PN}.png || die
+		newicon ${WORKDIR}/favicon.png ${PN}.png || die
 		make_desktop_entry ${PN} "Red Eclipse" ${PN}
 	fi

next             reply	other threads:[~2012-05-12 11:50 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-12 11:50 Michael Weber [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-03-21 17:51 [gentoo-commits] proj/gamerlay:master commit in: games-fps/redeclipse/ Azamat H. Hackimov
2012-09-30 11:09 Azamat H. Hackimov
2012-05-13 18:09 Azamat H. Hackimov
2011-07-26 14:32 Azamat H. Hackimov
2011-04-13  0:19 Azamat H. Hackimov
2011-03-28 21:19 Azamat H. Hackimov

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:f120819 dfblob:59ff1a0 dfblob:d934cb1 dfblob:59ff1a0
dfblob:0a199cd )
 OR (
bs:"[gentoo-commits] proj/gamerlay:master commit in: games-fps/redeclipse/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1336823417.1a20ac20e2e643c3d23c672c84690a751ddab97c.xmw@gentoo \
    --to=xmw@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

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