commit: f2daf5fb7d2f7ab42aae5c739791e4ae8db2b31b Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> AuthorDate: Mon Apr 23 19:16:35 2018 +0000 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> CommitDate: Mon Apr 23 19:17:24 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2daf5fb
games-arcade/rocksndiamonds: Drop old Package-Manager: Portage-2.3.31, Repoman-2.3.9 games-arcade/rocksndiamonds/Manifest | 1 - .../rocksndiamonds-3.3.1.2-parallel-build.patch | 12 --- .../files/rocksndiamonds-3.3.1.2-perms.patch | 29 ------ .../rocksndiamonds/rocksndiamonds-3.3.1.2.ebuild | 109 --------------------- 4 files changed, 151 deletions(-) diff --git a/games-arcade/rocksndiamonds/Manifest b/games-arcade/rocksndiamonds/Manifest index 4b7ae7392b8..e43385063a1 100644 --- a/games-arcade/rocksndiamonds/Manifest +++ b/games-arcade/rocksndiamonds/Manifest @@ -8,5 +8,4 @@ DIST rnd_jue-v8.tar.bz2 17244645 BLAKE2B 92d0cf646296b065c9ebe54d8d5ecb831eeb497 DIST rockslevels-dx-1.0.tar.gz 211151 BLAKE2B 637a600f9197925d82e7ef344c90f04e8508c6b114fd07ad00977d91a856ff85dc29207e5f22c659382ee0759f8607e9dc8ad0c0de3826d57b74d494320b57ad SHA512 2e1bc4484a76bf638e8ce285972b20b6377e0483abb2475e2343d48de1f84ee102f430049d685b89bc1087e0f20b9b6e29370f8e6cae66b480d3650be9991f44 DIST rockslevels-emc-1.0.tar.gz 3824268 BLAKE2B 0feadd5d9c6225c8574576281d07e14ff98fc9a33c67d3fa5083219ce39daaa1902a5ed652b5379fa4e58ee2428a8a452d66520571206143fd0fcd54f71b977a SHA512 9abad888fa00bc305444367c5ab8ffdad95eaca22613573e44d5ecd93b1a9a1cbc931497c064002d90fd3174c4661d0b009ede7746b2fe8da0a00072303a1301 DIST rockslevels-sp-1.0.tar.gz 373564 BLAKE2B 3f724ea55bbdaae80a35d6a9f5d8751a9228862fbe1ba45419343b1968510e10d3c82cc01844e35bc35561e65df3bc7e5ec2a0b807e1f56359dc7dccc16e3cb0 SHA512 2d44e9238a72846b9d4fbab90288aa3b23af4957ffe0d42d95c523fd22f3587572864b3fc0b277894d2f3f56d6eff52ea009e5b2d59aebc34163a1067662d729 -DIST rocksndiamonds-3.3.1.2.tar.gz 2614904 BLAKE2B a231a4a1beb35c29466f58c680cd86ddffbff48974d59d32c6e2a030b24fb3e6e99b825a254963a77830e62a6e1030f86350b1b9091d08b94dbbe577a2dbf2c2 SHA512 b627e4a8e2f03dc380b5a111cc42f296b283e63b20e019f522a8a1431fe9c138eb0dc7aa0fa03dd843c3a93bcd0a90704e651f5a590cb7d4c3e3b46976125755 DIST rocksndiamonds-4.1.0.0.tar.gz 3850621 BLAKE2B 9c85aced223b855eec0300634d2fb30513d8b2d1856d8e134594f7de1669cf64f487a87335e28f7b8abb0c13492573ac5bd3261cfc5274287e75d0ace258ab93 SHA512 4949c2e9a601c8e005b006b13b82e36f7f001321051d392bc34aa4c234c6cddfa9fae16e58d83070072cac1429e13f1fb96d2c4b2ecd35a309065ca3c1c869c2 diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-parallel-build.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-parallel-build.patch deleted file mode 100644 index 0aa70965212..00000000000 --- a/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-parallel-build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru rocksndiamonds-3.3.1.2.orig/src/Makefile rocksndiamonds-3.3.1.2/src/Makefile ---- rocksndiamonds-3.3.1.2.orig/src/Makefile 2013-11-24 08:05:56.000000000 -0500 -+++ rocksndiamonds-3.3.1.2/src/Makefile 2014-12-31 15:47:37.539941795 -0500 -@@ -255,7 +255,7 @@ - # build targets - # ----------------------------------------------------------------------------- - --all: $(AUTOCONF) libgame_dir game_em_dir game_sp_dir $(PROGNAME) -+all: $(PROGNAME) - - $(PROGNAME): $(RNDLIBS) $(TIMESTAMP_FILE) $(OBJS) $(ICON) - $(CC) $(PROFILING) $(OBJS) $(ICON) $(RNDLIBS) $(LDFLAGS) -o $(PROGNAME) diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-perms.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-perms.patch deleted file mode 100644 index 65a06e6cdf7..00000000000 --- a/games-arcade/rocksndiamonds/files/rocksndiamonds-3.3.1.2-perms.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up rocksndiamonds-3.3.0.1/src/libgame/setup.c.CVE-2011-4606 rocksndiamonds-3.3.0.1/src/libgame/setup.c ---- rocksndiamonds-3.3.0.1/src/libgame/setup.c.CVE-2011-4606 2011-12-12 14:28:30.083078680 -0500 -+++ rocksndiamonds-3.3.0.1/src/libgame/setup.c 2011-12-12 14:34:36.758744753 -0500 -@@ -1293,11 +1293,14 @@ void sortTreeInfo(TreeInfo **node_first) - #define MODE_W_ALL (S_IWUSR | S_IWGRP | S_IWOTH) - #define MODE_X_ALL (S_IXUSR | S_IXGRP | S_IXOTH) - -+#define MODE_R_PRIVATE (S_IRUSR) - #define MODE_W_PRIVATE (S_IWUSR) -+#define MODE_X_PRIVATE (S_IXUSR) -+ - #define MODE_W_PUBLIC (S_IWUSR | S_IWGRP) - #define MODE_W_PUBLIC_DIR (S_IWUSR | S_IWGRP | S_ISGID) - --#define DIR_PERMS_PRIVATE (MODE_R_ALL | MODE_X_ALL | MODE_W_PRIVATE) -+#define DIR_PERMS_PRIVATE (MODE_R_PRIVATE | MODE_X_PRIVATE | MODE_W_PRIVATE) - #define DIR_PERMS_PUBLIC (MODE_R_ALL | MODE_X_ALL | MODE_W_PUBLIC_DIR) - - #define FILE_PERMS_PRIVATE (MODE_R_ALL | MODE_W_PRIVATE) -@@ -1456,7 +1459,8 @@ void createDirectory(char *dir, char *te - if (running_setgid) - posix_umask(last_umask & group_umask); - else -- dir_mode |= MODE_W_ALL; -+ if (permission_class == PERMS_PUBLIC) -+ dir_mode |= MODE_W_ALL; - - if (!fileExists(dir)) - if (posix_mkdir(dir, dir_mode) != 0) diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.ebuild deleted file mode 100644 index 509d8487cc0..00000000000 --- a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit flag-o-matic eutils games - -DESCRIPTION="A Boulderdash clone" -HOMEPAGE="http://www.artsoft.org/rocksndiamonds/"; -SRC_URI="http://www.artsoft.org/RELEASES/unix/rocksndiamonds/${P}.tar.gz - http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Contributions-1.2.0.zip - http://www.artsoft.org/RELEASES/rocksndiamonds/levels/BD2K3-1.0.0.zip - http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Boulder_Dash_Dream-1.0.0.zip - http://www.artsoft.org/RELEASES/rocksndiamonds/levels/rnd-contrib-1.0.0.tar.gz - http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Snake_Bite-1.0.0.zip - http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Sokoban-1.0.0.zip - http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-emc-1.0.tar.gz - http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-sp-1.0.tar.gz - http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-dx-1.0.tar.gz - mirror://gentoo/rnd_jue-v8.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X sdl" - -RDEPEND="X? ( x11-libs/libX11 ) - !sdl? ( x11-libs/libX11 ) - sdl? ( - >=media-libs/libsdl-1.2.3[joystick,video] - >=media-libs/sdl-mixer-1.2.4[mod,mp3,timidity] - media-libs/sdl-net - >=media-libs/sdl-image-1.2.2[gif] - media-libs/smpeg - )" -DEPEND="${RDEPEND} - app-arch/unzip - X? ( x11-libs/libXt ) - !sdl? ( x11-libs/libXt )" - -src_unpack() { - unpack ${P}.tar.gz - cd "${S}" - unpack \ - rockslevels-emc-1.0.tar.gz \ - rockslevels-sp-1.0.tar.gz \ - rockslevels-dx-1.0.tar.gz - cd levels - unpack \ - rnd_jue-v8.tar.bz2 \ - BD2K3-1.0.0.zip \ - rnd-contrib-1.0.0.tar.gz \ - Snake_Bite-1.0.0.zip \ - Contributions-1.2.0.zip \ - Boulder_Dash_Dream-1.0.0.zip \ - Sokoban-1.0.0.zip -} - -src_prepare() { - # make it parallel-friendly. - epatch \ - "${FILESDIR}"/${P}-parallel-build.patch \ - "${FILESDIR}"/${P}-perms.patch - sed -i \ - -e 's:\$(MAKE_CMD):$(MAKE) -C $(SRC_DIR):' \ - -e '/^MAKE/d' \ - -e '/^CC/d' \ - Makefile || die - - sed -i \ - -e '/^LDFLAGS/s/=/+=/' \ - src/Makefile || die -} - -src_compile() { - replace-cpu-flags k6 k6-1 k6-2 i586 - - local makeopts="RO_GAME_DIR=${GAMES_DATADIR}/${PN} RW_GAME_DIR=${GAMES_STATEDIR}/${PN}" - if use X || { ! use X && ! use sdl; } ; then - emake -j1 clean - emake ${makeopts} OPTIONS="${CFLAGS}" x11 - mv rocksndiamonds{,.x11} - fi - if use sdl ; then - emake -j1 clean - emake ${makeopts} OPTIONS="${CFLAGS}" sdl - mv rocksndiamonds{,.sdl} - fi -} - -src_install() { - if use X || { ! use X && ! use sdl; } ; then - dogamesbin rocksndiamonds.x11 - fi - if use sdl ; then - dogamesbin rocksndiamonds.sdl - dosym rocksndiamonds.sdl "${GAMES_BINDIR}/rocksndiamonds" - else - dosym rocksndiamonds.x11 "${GAMES_BINDIR}/rocksndiamonds" - fi - insinto "${GAMES_DATADIR}/${PN}" - doins -r docs graphics levels music sounds - - newman rocksndiamonds.{1,6} - dodoc CREDITS ChangeLog README - newicon graphics/gfx_classic/rocks_icon_32x32.pcx ${PN}.pcx - make_desktop_entry rocksndiamonds "Rocks 'N' Diamonds" /usr/share/pixmaps/${PN}.pcx - - prepgamesdirs -}
