From: Tristan Heaven Date: Sun, 19 Nov 2006 21:01:09 +0000 (+0000) Subject: Use wxwidgets eclass X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=44af2a066ab6fb6735fdb05831ee2d701c4b190e;p=gentoo.git Use wxwidgets eclass Package-Manager: portage-2.1.2_rc2 --- diff --git a/games-misc/jugglemaster/ChangeLog b/games-misc/jugglemaster/ChangeLog index 7b2ebb6c5b72..717f7906d363 100644 --- a/games-misc/jugglemaster/ChangeLog +++ b/games-misc/jugglemaster/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-misc/jugglemaster # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-misc/jugglemaster/ChangeLog,v 1.6 2006/06/03 10:30:06 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-misc/jugglemaster/ChangeLog,v 1.7 2006/11/19 21:01:09 nyhm Exp $ + + 19 Nov 2006; Tristan Heaven jugglemaster-0.4.ebuild: + Use wxwidgets eclass 03 Jun 2006; +files/jugglemaster-0.4-ffmpeg.patch, jugglemaster-0.4.ebuild: diff --git a/games-misc/jugglemaster/Manifest b/games-misc/jugglemaster/Manifest index 720f543af98d..55adcaac21c0 100644 --- a/games-misc/jugglemaster/Manifest +++ b/games-misc/jugglemaster/Manifest @@ -6,14 +6,14 @@ MD5 5889ad9fd88a3df50e99db7fdb618b23 files/jugglemaster-0.4-ffmpeg.patch 329 RMD160 4fa74314d419605057836855e155dc0d639a9571 files/jugglemaster-0.4-ffmpeg.patch 329 SHA256 907f9ed1de7ac419d5a05bf73d6961204ce77150caf5a5dbfb981ffbe4b6c75e files/jugglemaster-0.4-ffmpeg.patch 329 DIST jugglemaster-0.4.tar.bz2 134034 RMD160 c3e27e4285256fbe8934d86c81490ac246a33775 SHA1 25ff829f3c077333c5977598521233b37517ab6f SHA256 6af92b537bff4ba2dbdd1d26891ec7826c39760fc45a1247952d53b26a56d239 -EBUILD jugglemaster-0.4.ebuild 979 RMD160 c9282314e2416241876a1e9498674b51bc3164c8 SHA1 d8a05c5ed3badaf3e4e6a0ec50ed356b49d52f51 SHA256 99b25ad83350f888af984c2b07b39439256fcb2cd03e2812f820984e18eb2e4c -MD5 132e289c1b802146014ba72fa8be7393 jugglemaster-0.4.ebuild 979 -RMD160 c9282314e2416241876a1e9498674b51bc3164c8 jugglemaster-0.4.ebuild 979 -SHA256 99b25ad83350f888af984c2b07b39439256fcb2cd03e2812f820984e18eb2e4c jugglemaster-0.4.ebuild 979 -MISC ChangeLog 842 RMD160 73dfcd0d3eeb394c72939276ba1c14a307f65e1b SHA1 0a0c530b07aca45fcf1d070a8fd03c92d82a89fc SHA256 d8debf9950b54582318d636f568ace43be202b1c29658bda114a80aaeea1e136 -MD5 b99c4581e6bc4f387f60b6f4d50609da ChangeLog 842 -RMD160 73dfcd0d3eeb394c72939276ba1c14a307f65e1b ChangeLog 842 -SHA256 d8debf9950b54582318d636f568ace43be202b1c29658bda114a80aaeea1e136 ChangeLog 842 +EBUILD jugglemaster-0.4.ebuild 1308 RMD160 5cc4ea35a0f039da5393134df7cd73e9416deca7 SHA1 d318447950eff8a3017a23fea661798720b6c279 SHA256 c41e2d66c96e456cda1709338bd12e0bb68a3e2ffe4df61e46e1924cb8361443 +MD5 393804fb1119f2c977cc7f9e0efa657d jugglemaster-0.4.ebuild 1308 +RMD160 5cc4ea35a0f039da5393134df7cd73e9416deca7 jugglemaster-0.4.ebuild 1308 +SHA256 c41e2d66c96e456cda1709338bd12e0bb68a3e2ffe4df61e46e1924cb8361443 jugglemaster-0.4.ebuild 1308 +MISC ChangeLog 937 RMD160 6ef15876482555dd39876240d4751d034d86b33b SHA1 4ced3c5e9e6eedf3b058acc83ba4c8a94d6034de SHA256 987389524622c87ad0e9cbe4e6f942ae6ed750576835602c1ba44eb76bd1a4cc +MD5 1e96a2bf2ab2dba45ce525b8ea07e56c ChangeLog 937 +RMD160 6ef15876482555dd39876240d4751d034d86b33b ChangeLog 937 +SHA256 987389524622c87ad0e9cbe4e6f942ae6ed750576835602c1ba44eb76bd1a4cc ChangeLog 937 MISC metadata.xml 621 RMD160 a7352205b97da04ee51a8073d73006cce6518476 SHA1 e90f0219f1c9a807e7c9fd5e0445e58be6b4a45e SHA256 8c0578a5d8a87ca4e37d01b2bc559fdf6c13c811f5ed3fd9b726c6d9fd5419cc MD5 ae0ac63a9e262c96f2bfd0aee170fc40 metadata.xml 621 RMD160 a7352205b97da04ee51a8073d73006cce6518476 metadata.xml 621 @@ -22,9 +22,9 @@ MD5 d47fd1c2a6e911d1c2b01f6dc55246cd files/digest-jugglemaster-0.4 253 RMD160 b2e76bf66235604e3a945905b0685c845054421d files/digest-jugglemaster-0.4 253 SHA256 16106f56bd3a1b863e6f60758ce086fef356bcc55a80c9eaac86de39502e5f03 files/digest-jugglemaster-0.4 253 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.3 (GNU/Linux) +Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFEgWS42CTtIKiFlQIRAp4fAJ0Yr0I8Wi9LfeoPAefOQfZNPExCCgCgg0yV -Os2JcJdJDZR3kJxl5i6oCGw= -=jasu +iD8DBQFFYMYcdz7hIScOURERAniqAJ4yF9RBt4oW4VrreGnhe47TbBiBNgCeIqAX +VfTx7VSPmfd6TedGQT3xLGI= +=Jj6m -----END PGP SIGNATURE----- diff --git a/games-misc/jugglemaster/jugglemaster-0.4.ebuild b/games-misc/jugglemaster/jugglemaster-0.4.ebuild index ad86d0a1d3e5..9eb1474a3788 100644 --- a/games-misc/jugglemaster/jugglemaster-0.4.ebuild +++ b/games-misc/jugglemaster/jugglemaster-0.4.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-misc/jugglemaster/jugglemaster-0.4.ebuild,v 1.3 2006/06/03 10:30:06 tupone Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-misc/jugglemaster/jugglemaster-0.4.ebuild,v 1.4 2006/11/19 21:01:09 nyhm Exp $ + +inherit eutils toolchain-funcs wxwidgets games -inherit eutils DESCRIPTION="A siteswap animator" HOMEPAGE="http://icculus.org/jugglemaster/" SRC_URI="http://icculus.org/${PN}/download/${P}.tar.bz2" @@ -12,31 +13,45 @@ SLOT="0" KEYWORDS="~ppc x86" IUSE="ffmpeg" -DEPEND="x11-libs/wxGTK +DEPEND=">=x11-libs/wxGTK-2.6 ffmpeg? ( media-video/ffmpeg )" +pkg_setup() { + games_pkg_setup + WX_GTK_VER=2.6 need-wxwidgets gtk2 +} + src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/${P}"-ffmpeg.patch if use ffmpeg ; then + epatch "${FILESDIR}/${P}"-ffmpeg.patch sed -i \ -e "s/libavcodec/ffmpeg/" \ src/jmdlx/Makefile \ - || die "sed failed" + || die "sed Makefile (ffmpeg) failed" sed -i \ -e "/^FFMPEG_PREFIX/s:=.*:=/usr/include:" \ -e "/^HAVE_FFMPEG/s:0:1:" \ Makefile.cfg \ - || die "sed failed" + || die "sed Makefile.cfg failed" fi + sed -i \ + -e '/wx-config --ldflags/d' \ + -e "s:wx-config:${WX_CONFIG}:" \ + src/jmdlx/Makefile \ + || die "sed Makefile (wx) failed" } src_compile() { - emake -C src/jmdlx || die "emake failed" + emake \ + -C src/jmdlx \ + CXX=$(tc-getCXX) \ + || die "emake failed" } src_install () { - dobin src/jmdlx/jmdlx || die "dobin failed" + dogamesbin src/jmdlx/jmdlx || die "dogamesbin failed" dodoc ChangeLog README TODO + prepgamesdirs }