diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-09-16 01:13:05 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-09-16 01:13:05 +0000 |
| commit | d12d707ef1722c0834642910a52e47fd2a448f5a (patch) | |
| tree | 9c275e8603e144c6ebfe6bfb892ec95bd977ba4f | |
| parent | Mark 0.32 stable on alpha (diff) | |
| download | gentoo-2-d12d707ef1722c0834642910a52e47fd2a448f5a.tar.gz gentoo-2-d12d707ef1722c0834642910a52e47fd2a448f5a.tar.bz2 gentoo-2-d12d707ef1722c0834642910a52e47fd2a448f5a.zip | |
Fix linking against esound libs and clean up build process in general #106088 by Marien Zwart.
(Portage version: 2.0.52-r1 http://ronaldmcnightrider.ytmnd.com/ )
| -rw-r--r-- | games-puzzle/gtetrinet/ChangeLog | 8 | ||||
| -rw-r--r-- | games-puzzle/gtetrinet/gtetrinet-0.7.9.ebuild | 33 |
2 files changed, 19 insertions, 22 deletions
diff --git a/games-puzzle/gtetrinet/ChangeLog b/games-puzzle/gtetrinet/ChangeLog index 34e9ff9e959c..8f37c501ca1d 100644 --- a/games-puzzle/gtetrinet/ChangeLog +++ b/games-puzzle/gtetrinet/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-puzzle/gtetrinet -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gtetrinet/ChangeLog,v 1.11 2005/06/03 14:10:10 axxo Exp $ +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gtetrinet/ChangeLog,v 1.12 2005/09/16 01:13:05 vapier Exp $ + + 16 Sep 2005; Mike Frysinger <vapier@gentoo.org> gtetrinet-0.7.9.ebuild: + Fix linking against esound libs and clean up build process in general + #106088 by Marien Zwart. *gtetrinet-0.7.9 (03 Jun 2005) diff --git a/games-puzzle/gtetrinet/gtetrinet-0.7.9.ebuild b/games-puzzle/gtetrinet/gtetrinet-0.7.9.ebuild index b8c2ff46e7c8..e044fb0518c3 100644 --- a/games-puzzle/gtetrinet/gtetrinet-0.7.9.ebuild +++ b/games-puzzle/gtetrinet/gtetrinet-0.7.9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gtetrinet/gtetrinet-0.7.9.ebuild,v 1.1 2005/06/03 14:10:10 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/gtetrinet/gtetrinet-0.7.9.ebuild,v 1.2 2005/09/16 01:13:05 vapier Exp $ # games after gnome2 so games' functions will override gnome2's inherit gnome2 games @@ -12,7 +12,7 @@ SRC_URI="${SRC_URI} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86 ~amd64 ~sparc ~ppc" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="nls ipv6" RDEPEND="dev-libs/libxml2 @@ -21,40 +21,33 @@ RDEPEND="dev-libs/libxml2 >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2" DEPEND="${RDEPEND} - >=sys-apps/sed-4 dev-util/pkgconfig nls? ( sys-devel/gettext )" src_unpack() { unpack ${A} - cd ${S} - return 0 + cd "${S}" sed -i \ - -e "s:\$(datadir)/pixmaps:/usr/share/pixmaps:" \ - -e "/DISABLE_DEPRECATED/d" \ - {.,icons,src}/Makefile.in \ - || die "sed Makefile.in failed" + -e "/^pkgdatadir =/s:=.*:= ${GAMES_DATADIR}/${PN}:" \ + src/Makefile.in themes/*/Makefile.in || die "sed themes" + sed -i \ + -e '/^LDADD/s:$: @ESD_LIBS@:' \ + -e '/^gamesdir/s:=.*:=@bindir@:' \ + src/Makefile.in || die "sed bindir" } src_compile() { - egamesconf \ + econf \ $(use_enable ipv6) \ - --sysconfdir=/etc \ + --bindir="${GAMES_BINDIR}" \ || die emake || die "emake failed" } src_install() { - USE_DESTDIR=1 - gnome2_src_install + USE_DESTDIR=1 gnome2_src_install dodoc AUTHORS ChangeLog NEWS README TODO - - # move some stuff around - cd ${D}/${GAMES_PREFIX} - mkdir bin && mv games/gtetrinet bin/ - rm -rf games && cd ${D}/${GAMES_DATADIR} && mv applications locale ../ - use nls || rm -rf ../locale - mv ${WORKDIR}/gentoo ${D}/${GAMES_DATADIR}/${PN}/themes/ + mv "${WORKDIR}"/gentoo "${D}/${GAMES_DATADIR}"/${PN}/themes/ prepgamesdirs } |