From: Peter Volkov Date: Mon, 9 Apr 2007 15:19:28 +0000 (+0000) Subject: Version bump. This is 0.8.29-WIP4! Enjoy :) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=06cf292d32ffbbaa608f7d18d1a411368a60f8a8;p=gentoo.git Version bump. This is 0.8.29-WIP4! Enjoy :) Package-Manager: portage-2.1.2.2 --- diff --git a/app-emulation/e-uae/ChangeLog b/app-emulation/e-uae/ChangeLog index ca95ad89b563..666270264418 100644 --- a/app-emulation/e-uae/ChangeLog +++ b/app-emulation/e-uae/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for app-emulation/e-uae # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/ChangeLog,v 1.34 2007/03/19 10:56:33 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/ChangeLog,v 1.35 2007/04/09 15:19:28 pva Exp $ + +*e-uae-0.8.29_rc4 (09 Apr 2007) + + 09 Apr 2007; + -files/e-uae-0.8.29-20070223-filesys_fix.diff, + -e-uae-0.8.29_pre20070223-r1.ebuild, -e-uae-0.8.29_pre20070317.ebuild, + +e-uae-0.8.29_rc4.ebuild: + Version bump. This is 0.8.29-WIP4! Enjoy :) *e-uae-0.8.29_pre20070317 (19 Mar 2007) diff --git a/app-emulation/e-uae/Manifest b/app-emulation/e-uae/Manifest index 31b8938dcf35..b0a66a2dbcbd 100644 --- a/app-emulation/e-uae/Manifest +++ b/app-emulation/e-uae/Manifest @@ -22,29 +22,20 @@ AUX e-uae-0.8.28-themes_rendering_fix.diff 5832 RMD160 0fbcf0d77176f09ccad6b037b MD5 4c3572a4f40235e86bf1a769eba1e6f9 files/e-uae-0.8.28-themes_rendering_fix.diff 5832 RMD160 0fbcf0d77176f09ccad6b037b835002b47b9c084 files/e-uae-0.8.28-themes_rendering_fix.diff 5832 SHA256 164acc45e9353f2b8551c133e892237fa087aaeda66eaf2cd23820254f7a5eb2 files/e-uae-0.8.28-themes_rendering_fix.diff 5832 -AUX e-uae-0.8.29-20070223-filesys_fix.diff 680 RMD160 4f51034e3f423e95604772334163298c92b5ade8 SHA1 6fae64b267a829f87fe236d2a730bbfeee3daf8c SHA256 5e76f618bdbc07c381aafe787a568dc409daf6dad126d19a464cd6eba045cefa -MD5 26cd00de3c7a9a1fa6379675455ff7e6 files/e-uae-0.8.29-20070223-filesys_fix.diff 680 -RMD160 4f51034e3f423e95604772334163298c92b5ade8 files/e-uae-0.8.29-20070223-filesys_fix.diff 680 -SHA256 5e76f618bdbc07c381aafe787a568dc409daf6dad126d19a464cd6eba045cefa files/e-uae-0.8.29-20070223-filesys_fix.diff 680 DIST e-uae-0.8.28.tar.bz2 1148790 RMD160 7e9fa21fa14b0ca3a32a28ccb236b9d7628a7f69 SHA1 11e647ed64420f85893ac77c072e268b650ae183 SHA256 afc8b30fb9aa0819a4e53b3eb0db8e658e5a2b23d7dbf436f6b5a49b2269da86 -DIST e-uae-0.8.29-20070223.tar.bz2 1087783 RMD160 540edb66a91aa954aa4cc147fa9430abaa14f880 SHA1 d1e3f80a4b9fd444285bfe114749f1ab9a1248ae SHA256 fe915e1792eb5e4e428cb1aab9a748021fd4e88c18c21f295360d7db535938fc -DIST e-uae-0.8.29-20070317.tar.bz2 1121746 RMD160 11095be5bd1182e6dbf774e8f1a9c4fcfae57621 SHA1 535799f5968708796118580a6855885b8082b0b8 SHA256 2c4e9bdc2d3b379653754efa9b32b98cb7c7d7581f4f866e113a058eb248f1db +DIST e-uae-0.8.29-WIP4.tar.bz2 1122718 RMD160 823810cd4c41ee31c394fcea9302f4ca680f0567 SHA1 f8c78fef04e6bcd7be36921790d71fcc6e47d00b SHA256 9828cb0fca783160bcb33900d0254f4bdaade1c9a41256e5f298e973d0c07456 EBUILD e-uae-0.8.28-r3.ebuild 3861 RMD160 93d562fcc99c83229e458244929723277d7897bf SHA1 592bb9752a81b09a42719a02bcf3d97df3bb3ece SHA256 f6127827b2c94c582c6a04ac0b4fbb35259aa8fed343f15a50b648a316689d66 MD5 3ce26f09dac49030a244d8d473f7a80b e-uae-0.8.28-r3.ebuild 3861 RMD160 93d562fcc99c83229e458244929723277d7897bf e-uae-0.8.28-r3.ebuild 3861 SHA256 f6127827b2c94c582c6a04ac0b4fbb35259aa8fed343f15a50b648a316689d66 e-uae-0.8.28-r3.ebuild 3861 -EBUILD e-uae-0.8.29_pre20070223-r1.ebuild 3899 RMD160 2f135584bee254c76773499c9aa393cdeed38241 SHA1 0d3f22990a74c34c16a1cf5149ec3938e3a96476 SHA256 c91d1cf3c0a12d9db0525004be788c916cf0ec9c636f9931bdff134e23103f53 -MD5 e4ea0862b97432d32e1953e89bdd43f5 e-uae-0.8.29_pre20070223-r1.ebuild 3899 -RMD160 2f135584bee254c76773499c9aa393cdeed38241 e-uae-0.8.29_pre20070223-r1.ebuild 3899 -SHA256 c91d1cf3c0a12d9db0525004be788c916cf0ec9c636f9931bdff134e23103f53 e-uae-0.8.29_pre20070223-r1.ebuild 3899 -EBUILD e-uae-0.8.29_pre20070317.ebuild 3786 RMD160 c7d8a217b1ddceeb4db7fa9abf194991d18057f2 SHA1 8481f24c7e5f7a3d37f990f3281259d3d1d11f82 SHA256 1e0aa5b58db5e0e22d347333eb70e8fa4f831ebd350753ba707142db0b9309d5 -MD5 9bf9daee83cb6592a5adde8bc212ff75 e-uae-0.8.29_pre20070317.ebuild 3786 -RMD160 c7d8a217b1ddceeb4db7fa9abf194991d18057f2 e-uae-0.8.29_pre20070317.ebuild 3786 -SHA256 1e0aa5b58db5e0e22d347333eb70e8fa4f831ebd350753ba707142db0b9309d5 e-uae-0.8.29_pre20070317.ebuild 3786 -MISC ChangeLog 5875 RMD160 99cef2e8246d1183e5373a9978cfd0c425b3187f SHA1 955f5f6b1d0b2c60f8cc04a0144657ab6f833f84 SHA256 2a2f18cec6e401d17843b8993763767fc733206240ca6144846fe66df658f0b0 -MD5 f5f38d6092528bdd5fd7cc32d17e5fd4 ChangeLog 5875 -RMD160 99cef2e8246d1183e5373a9978cfd0c425b3187f ChangeLog 5875 -SHA256 2a2f18cec6e401d17843b8993763767fc733206240ca6144846fe66df658f0b0 ChangeLog 5875 +EBUILD e-uae-0.8.29_rc4.ebuild 4125 RMD160 dba7b662fbf4b89952e9d2d255a26d811696510d SHA1 932d7fbbab072f364e77a67b85ba7054790fec21 SHA256 7c9728e55347bf043ebacf9794d5eedac5334d28249808a3481e9432aaf99e61 +MD5 3f3ebdb274e83050241b8d7f2230e3b8 e-uae-0.8.29_rc4.ebuild 4125 +RMD160 dba7b662fbf4b89952e9d2d255a26d811696510d e-uae-0.8.29_rc4.ebuild 4125 +SHA256 7c9728e55347bf043ebacf9794d5eedac5334d28249808a3481e9432aaf99e61 e-uae-0.8.29_rc4.ebuild 4125 +MISC ChangeLog 6137 RMD160 eb92960edd77412aabc850a45e6e3bf955703c6e SHA1 da976a01a7ca2a5c88b56c515a8f18a48cae1d04 SHA256 f2939d079f6152c8c616adb9781ca085b8dff3a822e2670bfefab9c56d190694 +MD5 71b1a0e379c9a780b28039a7189cfbb8 ChangeLog 6137 +RMD160 eb92960edd77412aabc850a45e6e3bf955703c6e ChangeLog 6137 +SHA256 f2939d079f6152c8c616adb9781ca085b8dff3a822e2670bfefab9c56d190694 ChangeLog 6137 MISC metadata.xml 468 RMD160 3cc57496496e8ed0e18330d5523ceb3d417bf222 SHA1 575564530c1b5d164d1eedcd003b4f43dc435abc SHA256 6bdc3ef9c0c895a8d4f227e52c2bb044d38fc00c17c04199ffd7a1aaa023ec0f MD5 107be5d8d010a6b3dac228473128bdf4 metadata.xml 468 RMD160 3cc57496496e8ed0e18330d5523ceb3d417bf222 metadata.xml 468 @@ -52,9 +43,6 @@ SHA256 6bdc3ef9c0c895a8d4f227e52c2bb044d38fc00c17c04199ffd7a1aaa023ec0f metadata MD5 188bf5165e1f85783a9ba7fa185f9fd3 files/digest-e-uae-0.8.28-r3 244 RMD160 754a2776d6ff1b461b1278828ea678dd002b4e3c files/digest-e-uae-0.8.28-r3 244 SHA256 82cc02576ec30a11aaafa85d5e55d9118795f73e0db80ed544cded39f1df25ac files/digest-e-uae-0.8.28-r3 244 -MD5 71cac33cab99c615336b5308bb92bb54 files/digest-e-uae-0.8.29_pre20070223-r1 271 -RMD160 d32bb222443c8d4d697bd4fd2e5be5f082df3094 files/digest-e-uae-0.8.29_pre20070223-r1 271 -SHA256 3157456aaa39597fdbc3ce0e9f3b8cd2247b79523c809e54491b2e39461bfa74 files/digest-e-uae-0.8.29_pre20070223-r1 271 -MD5 b98dce19c4676582299ebfc31a7ec3d7 files/digest-e-uae-0.8.29_pre20070317 271 -RMD160 2e784b2535fcfa4af32bb8c547c492de2388cb30 files/digest-e-uae-0.8.29_pre20070317 271 -SHA256 192ed8eb3debda8316459e4bbd8b7f6d17eedeedb60054ce5369ddd12ca9f75a files/digest-e-uae-0.8.29_pre20070317 271 +MD5 a00ed48c6f9a051d13e42c82a86fbae3 files/digest-e-uae-0.8.29_rc4 259 +RMD160 bb784dd253bd5b4386f0d978b422904cde63606c files/digest-e-uae-0.8.29_rc4 259 +SHA256 14d0cfccd6a35b27b32de57f1b7d8184d55286b8e553228e01d3a5777e7256ca files/digest-e-uae-0.8.29_rc4 259 diff --git a/app-emulation/e-uae/e-uae-0.8.29_pre20070317.ebuild b/app-emulation/e-uae/e-uae-0.8.29_pre20070317.ebuild deleted file mode 100644 index 91e0eb4fc166..000000000000 --- a/app-emulation/e-uae/e-uae-0.8.29_pre20070317.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/e-uae-0.8.29_pre20070317.ebuild,v 1.1 2007/03/19 10:56:33 pva Exp $ - -inherit eutils flag-o-matic - -my_ver=${PV%%_pre*} -snap_ver=${PV##*_pre} - -DESCRIPTION="The Ubiquitous Amiga Emulator with an emulation core largely based on WinUAE" -HOMEPAGE="http://www.rcdrummond.net/uae/" -SRC_URI="http://www.rcdrummond.net/uae/test/${snap_ver}/${PN}-${my_ver}-${snap_ver}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="X dga ncurses sdl gtk alsa oss sdl-sound capslib" - -# Note: opposed to ./configure --help zlib support required! Check -# src/Makefile.am that includes zfile.c unconditionaly. -RDEPEND="X? ( || ( ( x11-libs/libXt - x11-libs/libxkbfile - x11-libs/libXext - dga? ( x11-libs/libXxf86dga - x11-libs/libXxf86vm ) - ) - virtual/x11 - ) - ) - !X? ( sdl? ( media-libs/libsdl ) - !sdl? ( sys-libs/ncurses ) ) - alsa? ( media-libs/alsa-lib ) - !alsa? ( sdl-sound? ( media-libs/sdl-sound ) ) - gtk? ( >=x11-libs/gtk+-2.0 ) - capslib? ( >=games-emulation/caps-20060612 ) - sys-libs/zlib - virtual/cdrtools" - -DEPEND="$RDEPEND - X? ( dga? ( x11-proto/xf86vidmodeproto - x11-proto/xf86dgaproto ) )" - -S="${WORKDIR}"/${PN}-${my_ver}-${snap_ver} - -pkg_setup() { - # Sound setup. - if use alsa; then - elog "Choosing alsa as sound target to use." - myconf="--with-alsa --without-sdl-sound" - elif use sdl-sound ; then - if ! use sdl ; then - ewarn "sdl-sound is not enabled because sdl USE flag is disabled. Leaving" - ewarn "sound on oss autodetection." - myconf="--without-alsa --without-sdl-sound" - ebeep - else - elog "Choosing sdl-sound as sound target to use." - ewarn "E-UAE with the SDL audio back-end doesn't work correctly in Linux." - ewarn "Better use alsa... You've been warned ;)" - ebeep - myconf="--without-alsa --with-sdl-sound" - fi - elif use oss ; then - elog "Choosing oss as sound target to use." - ewarn "oss will be autodetected. See output of configure." - myconf="--without-alsa --without-sdl-sound" - else - ewarn "There is no alsa, sdl-sound or oss in USE. Sound target disabled!" - myconf="--disable-audio" - fi - - # VIDEO setup. X is autodetected (there is no --with-X option). - if use X ; then - elog "Using X11 for video output." - ewarn "Fullscreen mode is not working in X11 currently. Use sdl." - myconf="$myconf --without-curses --without-sdl-gfx" - use dga && ewarn "To use dga you have to run e-uae as root." - use dga && myconf="$myconf --enable-dga --enable-vidmode" - elif use sdl ; then - elog "Using sdl for video output." - myconf="$myconf --with-sdl --with-sdl-gfx --without-curses" - elif use ncurses; then - elog "Using ncurses for video output." - myconf="$myconf --with-curses --without-sdl-gfx" - else - ewarn "There is no X or sdl or ncurses in USE!" - ewarn "Following upstream falling back on ncurses." - myconf="$myconf --with-curses --without-sdl-gfx" - ebeep - fi - - use gtk && myconf="$myconf --enable-ui --enable-threads" - use gtk || myconf="$myconf --disable-ui" - - myconf="$myconf $(use_with capslib caps)" - - myconf="$myconf --with-zlib" - - # And explicitly state defaults: - myconf="$myconf --enable-aga" - myconf="$myconf --enable-autoconfig --enable-scsi-device --enable-cdtv --enable-cd32" - myconf="$myconf --enable-bsdsock" -} - -src_compile() { - strip-flags - - econf ${myconf} \ - --with-libscg-includedir=/usr/include/scsilib \ - || die "./configure failed" - - emake -j1 || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - # Rename it to e-uae - mv "${D}/usr/bin/uae" "${D}/usr/bin/${PN}" - mv "${D}/usr/bin/readdisk" "${D}/usr/bin/e-readdisk" - - dodoc docs/* README ChangeLog -} diff --git a/app-emulation/e-uae/e-uae-0.8.29_pre20070223-r1.ebuild b/app-emulation/e-uae/e-uae-0.8.29_rc4.ebuild similarity index 85% rename from app-emulation/e-uae/e-uae-0.8.29_pre20070223-r1.ebuild rename to app-emulation/e-uae/e-uae-0.8.29_rc4.ebuild index cbf21f3949d2..e5e65c756fa8 100644 --- a/app-emulation/e-uae/e-uae-0.8.29_pre20070223-r1.ebuild +++ b/app-emulation/e-uae/e-uae-0.8.29_rc4.ebuild @@ -1,15 +1,24 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/e-uae-0.8.29_pre20070223-r1.ebuild,v 1.1 2007/02/26 07:19:26 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/e-uae-0.8.29_rc4.ebuild,v 1.1 2007/04/09 15:19:28 pva Exp $ inherit eutils flag-o-matic -my_ver=${PV%%_pre*} -snap_ver=${PV##*_pre} - DESCRIPTION="The Ubiquitous Amiga Emulator with an emulation core largely based on WinUAE" HOMEPAGE="http://www.rcdrummond.net/uae/" -SRC_URI="http://www.rcdrummond.net/uae/test/${snap_ver}/${PN}-${my_ver}-${snap_ver}.tar.bz2" +# We support _rcX for WIPX versions and _preYYYYMMDD for CVS snapshots. +if [[ "${PV%%_rc*}" = "${PV}" ]] ; then + # _pre is used, cvs version + my_ver=${PV%%_pre*} + snap_ver=${PV##*_pre} + S="${WORKDIR}"/${PN}-${my_ver}-${snap_ver} + SRC_URI="http://www.rcdrummond.net/uae/test/${snap_ver}/${PN}-${my_ver}-${snap_ver}.tar.bz2" +else + my_ver=${PV%%_rc*} + WIP_ver=${PV##*_rc} + S="${WORKDIR}"/${PN}-${my_ver}-WIP${WIP_ver} + SRC_URI="http://www.rcdrummond.net/uae/${PN}-${my_ver}-WIP${WIP_ver}/${PN}-${my_ver}-WIP${WIP_ver}.tar.bz2" +fi LICENSE="GPL-2" SLOT="0" @@ -40,8 +49,6 @@ DEPEND="$RDEPEND X? ( dga? ( x11-proto/xf86vidmodeproto x11-proto/xf86dgaproto ) )" -S="${WORKDIR}"/${PN}-${my_ver}-${snap_ver} - pkg_setup() { # Sound setup. if use alsa; then @@ -102,13 +109,6 @@ pkg_setup() { myconf="$myconf --enable-bsdsock" } -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${PN}-${my_ver}-${snap_ver}-filesys_fix.diff -} - src_compile() { strip-flags diff --git a/app-emulation/e-uae/files/digest-e-uae-0.8.29_pre20070223-r1 b/app-emulation/e-uae/files/digest-e-uae-0.8.29_pre20070223-r1 deleted file mode 100644 index 520cc3c61735..000000000000 --- a/app-emulation/e-uae/files/digest-e-uae-0.8.29_pre20070223-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 21738a7aa9b37f934570c33a4b147c7b e-uae-0.8.29-20070223.tar.bz2 1087783 -RMD160 540edb66a91aa954aa4cc147fa9430abaa14f880 e-uae-0.8.29-20070223.tar.bz2 1087783 -SHA256 fe915e1792eb5e4e428cb1aab9a748021fd4e88c18c21f295360d7db535938fc e-uae-0.8.29-20070223.tar.bz2 1087783 diff --git a/app-emulation/e-uae/files/digest-e-uae-0.8.29_pre20070317 b/app-emulation/e-uae/files/digest-e-uae-0.8.29_pre20070317 deleted file mode 100644 index 89766697378b..000000000000 --- a/app-emulation/e-uae/files/digest-e-uae-0.8.29_pre20070317 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 5ac9d37bb6a1e9afa2ba1bd3df12badb e-uae-0.8.29-20070317.tar.bz2 1121746 -RMD160 11095be5bd1182e6dbf774e8f1a9c4fcfae57621 e-uae-0.8.29-20070317.tar.bz2 1121746 -SHA256 2c4e9bdc2d3b379653754efa9b32b98cb7c7d7581f4f866e113a058eb248f1db e-uae-0.8.29-20070317.tar.bz2 1121746 diff --git a/app-emulation/e-uae/files/digest-e-uae-0.8.29_rc4 b/app-emulation/e-uae/files/digest-e-uae-0.8.29_rc4 new file mode 100644 index 000000000000..e00c4dc480f7 --- /dev/null +++ b/app-emulation/e-uae/files/digest-e-uae-0.8.29_rc4 @@ -0,0 +1,3 @@ +MD5 cbfd7e3d7a1b323331afbb92ea7ff4f0 e-uae-0.8.29-WIP4.tar.bz2 1122718 +RMD160 823810cd4c41ee31c394fcea9302f4ca680f0567 e-uae-0.8.29-WIP4.tar.bz2 1122718 +SHA256 9828cb0fca783160bcb33900d0254f4bdaade1c9a41256e5f298e973d0c07456 e-uae-0.8.29-WIP4.tar.bz2 1122718 diff --git a/app-emulation/e-uae/files/e-uae-0.8.29-20070223-filesys_fix.diff b/app-emulation/e-uae/files/e-uae-0.8.29-20070223-filesys_fix.diff deleted file mode 100644 index 1f6b72863534..000000000000 --- a/app-emulation/e-uae/files/e-uae-0.8.29-20070223-filesys_fix.diff +++ /dev/null @@ -1,22 +0,0 @@ -Index: src/main.c -=================================================================== -RCS file: /cvsroot/uaedev/uae/src/main.c,v -retrieving revision 1.51 -diff -u -r1.51 main.c ---- src/main.c 23 Feb 2007 02:07:58 -0000 1.51 -+++ src/main.c 25 Feb 2007 19:26:10 -0000 -@@ -912,9 +912,11 @@ - - set_inhibit_frame (IHF_QUIT_PROGRAM); - -- if (uae_target_state == UAE_STATE_COLD_START || uae_target_state == UAE_STATE_WARM_START) { -- filesys_prepare_reset (); -- } -+#ifdef FILESYS -+ /* Ensure any cached changes to virtual filesystem are flushed before -+ * resetting or exitting. */ -+ filesys_prepare_reset (); -+#endif - - } /* while (!QUITTING && !STOPPED) */ -