diff options
| author |   Alfredo Tupone <tupone@gentoo.org> | 2012-11-09 07:40:25 +0000 |
|---|---|---|
| committer | Alfredo Tupone <tupone@gentoo.org> | 2012-11-09 07:40:25 +0000 |
| commit | 53c42dca1a9820daa65b871b137fc57108b81713 (patch) | |
| tree | 3fe9d6fd3ee1226f19bd27592d9bcdab06b0a340 /games-puzzle | |
| parent | Added ~amd64 keyword (diff) | |
| download | gentoo-2-53c42dca1a9820daa65b871b137fc57108b81713.tar.gz gentoo-2-53c42dca1a9820daa65b871b137fc57108b81713.tar.bz2 gentoo-2-53c42dca1a9820daa65b871b137fc57108b81713.zip | |
Uses CC & CXXFLAGS setting. Bug #440024
(Portage version: 2.1.11.31/cvs/Linux i686, signed Manifest commit with key 0145142D)
Diffstat (limited to 'games-puzzle')
| -rw-r--r-- | games-puzzle/krystaldrop/ChangeLog | 8 | ||||
| -rw-r--r-- | games-puzzle/krystaldrop/files/krystaldrop-0.7.2-cxxflags.patch | 36 | ||||
| -rw-r--r-- | games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild | 13 |
3 files changed, 49 insertions, 8 deletions
diff --git a/games-puzzle/krystaldrop/ChangeLog b/games-puzzle/krystaldrop/ChangeLog index d8f003263e52..72b6d25bee58 100644 --- a/games-puzzle/krystaldrop/ChangeLog +++ b/games-puzzle/krystaldrop/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-puzzle/krystaldrop -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/krystaldrop/ChangeLog,v 1.11 2011/05/05 10:27:33 tupone Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/krystaldrop/ChangeLog,v 1.12 2012/11/09 07:40:25 tupone Exp $ + + 09 Nov 2012; Tupone Alfredo <tupone@gentoo.org> krystaldrop-0.7.2.ebuild, + +files/krystaldrop-0.7.2-cxxflags.patch: + Uses CC & CXXFLAGS setting. Bug #440024 by Diego 05 May 2011; Tupone Alfredo <tupone@gentoo.org> krystaldrop-0.7.2.ebuild, +files/krystaldrop-0.7.2-icu.patch: diff --git a/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-cxxflags.patch b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-cxxflags.patch new file mode 100644 index 000000000000..7fcb5aac603c --- /dev/null +++ b/games-puzzle/krystaldrop/files/krystaldrop-0.7.2-cxxflags.patch @@ -0,0 +1,36 @@ +--- Sources/Makefile.old 2012-11-09 08:04:43.029680861 +0100 ++++ Sources/Makefile 2012-11-09 08:16:02.650491943 +0100 +@@ -35,10 +35,6 @@ + export + VERSION=0_7_2 + +-CC=g++ +-LINK=g++ +-MAKE=make +- + SRC= KrystalDrop/main.cpp \ + KrystalDrop/Names.cpp \ + KrystalDrop/Controller/BackgroundController.cpp \ +@@ -159,7 +155,7 @@ + CCFLAGS:=$(CCFLAGS) -ggdb -DDEBUG -DDEBUG_SANITY_CHECK + endif + ifeq ($(DEBUG_MODE),no) +- CCFLAGS:=$(CCFLAGS) -O2 -DNDEBUG ++ CCFLAGS:=$(CCFLAGS) -DNDEBUG + endif + ifeq ($(DISPLAY_FPS),yes) + CCFLAGS:=$(CCFLAGS) -DDISPLAY_FPS +@@ -186,11 +182,11 @@ + @$(MAKE) -s --no-print-directory -f Makefile.dep $@ + + kdrop: $(OBJ) +- $(LINK) $(LDFLAGS) $(LCFLAGS) -o $@ $(OBJ) $(LIBS) ++ $(CXX) $(LDFLAGS) $(LCFLAGS) -o $@ $(OBJ) $(LIBS) + + $(OBJ): %.o: dep/%.d + $(OBJ): %.o: %.cpp +- $(CC) $(CCFLAGS) -o $@ -c $< ++ $(CXX) $(CCFLAGS) $(CXXFLAGS) -o $@ -c $< + + clean: + find -name "*.o" -exec rm {} ";" diff --git a/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild b/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild index 458c07b5f205..3e66540770e6 100644 --- a/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild +++ b/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild,v 1.12 2011/05/05 10:27:33 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/krystaldrop/krystaldrop-0.7.2.ebuild,v 1.13 2012/11/09 07:40:25 tupone Exp $ -EAPI=2 +EAPI=4 inherit eutils games DESCRIPTION="Free clone of an excellent NeoGeo puzzle game, Magical Drop" @@ -21,6 +21,7 @@ DEPEND="virtual/opengl media-libs/sdl-mixer media-libs/sdl-ttf dev-libs/libxml2" +DEPEND="${RDEPEND}" S=${WORKDIR}/${PN} @@ -33,7 +34,8 @@ src_prepare() { "${FILESDIR}"/${P}-as-needed.patch \ "${FILESDIR}"/${P}-deps.patch \ "${FILESDIR}"/${P}-icu.patch \ - "${FILESDIR}"/${P}-glibc2.10.patch + "${FILESDIR}"/${P}-glibc2.10.patch \ + "${FILESDIR}"/${P}-cxxflags.patch sed -i \ -e "/^EXEDIR:=/ s|$|/bin|" \ @@ -48,12 +50,11 @@ src_prepare() { } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + default dodir "${GAMES_STATEDIR}/${PN}" mv "${D}${GAMES_DATADIR}/${PN}/art/survival.sco" \ "${D}${GAMES_STATEDIR}/${PN}/" || die "mv failed" fperms 664 "${GAMES_STATEDIR}/${PN}/survival.sco" - dodoc CHANGES README doman doc/kdrop.6 newicon art/drop.png ${PN}.png make_desktop_entry kdrop "KrystalDrop" ${PN} |