| 1 |
commit: 1045230137a61c862f8c8c7a15792b93b69659b6 |
| 2 |
Author: Anna Vyalkova <cyber <AT> sysrq <DOT> in> |
| 3 |
AuthorDate: Sun May 16 16:03:24 2021 +0000 |
| 4 |
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
| 5 |
CommitDate: Sun May 16 16:11:07 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=10452301 |
| 7 |
|
| 8 |
games-emulation/melonds: fix AR, add noexecstack |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/785022 |
| 11 |
Closes: https://bugs.gentoo.org/780969 |
| 12 |
Signed-off-by: Anna Vyalkova <cyber <AT> sysrq.in> |
| 13 |
|
| 14 |
games-emulation/melonds/Manifest | 1 - |
| 15 |
games-emulation/melonds/melonds-0.9.1.ebuild | 55 ---------------------------- |
| 16 |
games-emulation/melonds/melonds-0.9.2.ebuild | 16 +++++++- |
| 17 |
games-emulation/melonds/melonds-9999.ebuild | 16 +++++++- |
| 18 |
4 files changed, 30 insertions(+), 58 deletions(-) |
| 19 |
|
| 20 |
diff --git a/games-emulation/melonds/Manifest b/games-emulation/melonds/Manifest |
| 21 |
index 292c4a972..439e3d062 100644 |
| 22 |
--- a/games-emulation/melonds/Manifest |
| 23 |
+++ b/games-emulation/melonds/Manifest |
| 24 |
@@ -1,2 +1 @@ |
| 25 |
-DIST melonDS-0.9.1.tar.gz 1311519 BLAKE2B 7d31f9de32799a28f9e179d05295fe7874f6d879ac63cebeaf7153f1cca553f816fd5fa2853d01b5ace1afe137f00fcd7b4526635ae9c8140ac348630225c745 SHA512 733a9f9352b7f61c76de761c7f632f5fca9c4ae2970a0235a7b5c0e6ca2ea550762472ff293f65ce29aaa63a610bb4f1a22b62e1957004606c2f85be60fbb8f2 |
| 26 |
DIST melonDS-0.9.2.tar.gz 1330793 BLAKE2B e504dd2e1344a9680b9820f7f0308fa30decb16f40675df5649babef7ab3fae9528042fc2737a36bafdd28b9125f94a79d20e5a5e791d485feb9dc26b64b1432 SHA512 3d099af675acdcb91431aaaf95bc27c10fd432ebd29aa81c7eb4e65dfad9c20cb4fd5de086d2162cbe4a6b41f7e140880a5742b1ec34eef0511fff052aa1baaa |
| 27 |
|
| 28 |
diff --git a/games-emulation/melonds/melonds-0.9.1.ebuild b/games-emulation/melonds/melonds-0.9.1.ebuild |
| 29 |
deleted file mode 100644 |
| 30 |
index 9e9589527..000000000 |
| 31 |
--- a/games-emulation/melonds/melonds-0.9.1.ebuild |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,55 +0,0 @@ |
| 34 |
-# Copyright 2019-2021 Gentoo Authors |
| 35 |
-# Distributed under the terms of the GNU General Public License v2 |
| 36 |
- |
| 37 |
-EAPI=7 |
| 38 |
- |
| 39 |
-MY_PN="melonDS" |
| 40 |
-MY_P="${MY_PN}-${PV}" |
| 41 |
- |
| 42 |
-inherit xdg cmake |
| 43 |
- |
| 44 |
-DESCRIPTION="Nintendo DS emulator, sorta" |
| 45 |
-HOMEPAGE=" |
| 46 |
- http://melonds.kuribo64.net |
| 47 |
- https://github.com/Arisotura/melonDS |
| 48 |
-" |
| 49 |
- |
| 50 |
-if [[ "${PV}" == *9999* ]]; then |
| 51 |
- inherit git-r3 |
| 52 |
- EGIT_REPO_URI="https://github.com/Arisotura/${MY_PN}.git" |
| 53 |
-else |
| 54 |
- SRC_URI="https://github.com/Arisotura/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" |
| 55 |
- KEYWORDS="~amd64" |
| 56 |
- S="${WORKDIR}/${MY_P}" |
| 57 |
-fi |
| 58 |
- |
| 59 |
-LICENSE="GPL-3" |
| 60 |
-SLOT="0" |
| 61 |
- |
| 62 |
-DEPEND=" |
| 63 |
- dev-qt/qtcore:5 |
| 64 |
- dev-qt/qtdeclarative:5 |
| 65 |
- dev-qt/qtgui:5 |
| 66 |
- dev-qt/qtwidgets:5 |
| 67 |
- media-libs/libsdl2[sound,video] |
| 68 |
- net-libs/gnutls |
| 69 |
- net-libs/libpcap |
| 70 |
- net-libs/libslirp |
| 71 |
- net-misc/curl |
| 72 |
- x11-libs/cairo |
| 73 |
-" |
| 74 |
-RDEPEND=" |
| 75 |
- ${DEPEND} |
| 76 |
-" |
| 77 |
- |
| 78 |
-pkg_postinst() { |
| 79 |
- xdg_pkg_postinst |
| 80 |
- |
| 81 |
- elog "You need the following files in order to run melonDS:" |
| 82 |
- elog "- bios7.bin" |
| 83 |
- elog "- bios9.bin" |
| 84 |
- elog "- firmware.bin" |
| 85 |
- elog "- romlist.bin" |
| 86 |
- elog "Place them in ~/.config/melonDS" |
| 87 |
- elog "Those files can be found somewhere on the Internet ;-)" |
| 88 |
-} |
| 89 |
|
| 90 |
diff --git a/games-emulation/melonds/melonds-0.9.2.ebuild b/games-emulation/melonds/melonds-0.9.2.ebuild |
| 91 |
index b567fa8d7..9113b2611 100644 |
| 92 |
--- a/games-emulation/melonds/melonds-0.9.2.ebuild |
| 93 |
+++ b/games-emulation/melonds/melonds-0.9.2.ebuild |
| 94 |
@@ -6,7 +6,7 @@ EAPI=7 |
| 95 |
MY_PN="melonDS" |
| 96 |
MY_P="${MY_PN}-${PV}" |
| 97 |
|
| 98 |
-inherit xdg cmake |
| 99 |
+inherit cmake flag-o-matic toolchain-funcs xdg |
| 100 |
|
| 101 |
DESCRIPTION="Nintendo DS emulator, sorta" |
| 102 |
HOMEPAGE=" |
| 103 |
@@ -44,6 +44,20 @@ RDEPEND=" |
| 104 |
${DEPEND} |
| 105 |
" |
| 106 |
|
| 107 |
+src_prepare() { |
| 108 |
+ cmake_src_prepare |
| 109 |
+} |
| 110 |
+ |
| 111 |
+src_configure() { |
| 112 |
+ append-ldflags -Wl,-z,noexecstack |
| 113 |
+ cmake_src_configure |
| 114 |
+} |
| 115 |
+ |
| 116 |
+src_compile() { |
| 117 |
+ tc-export AR |
| 118 |
+ cmake_src_compile |
| 119 |
+} |
| 120 |
+ |
| 121 |
pkg_postinst() { |
| 122 |
xdg_pkg_postinst |
| 123 |
|
| 124 |
|
| 125 |
diff --git a/games-emulation/melonds/melonds-9999.ebuild b/games-emulation/melonds/melonds-9999.ebuild |
| 126 |
index b567fa8d7..9113b2611 100644 |
| 127 |
--- a/games-emulation/melonds/melonds-9999.ebuild |
| 128 |
+++ b/games-emulation/melonds/melonds-9999.ebuild |
| 129 |
@@ -6,7 +6,7 @@ EAPI=7 |
| 130 |
MY_PN="melonDS" |
| 131 |
MY_P="${MY_PN}-${PV}" |
| 132 |
|
| 133 |
-inherit xdg cmake |
| 134 |
+inherit cmake flag-o-matic toolchain-funcs xdg |
| 135 |
|
| 136 |
DESCRIPTION="Nintendo DS emulator, sorta" |
| 137 |
HOMEPAGE=" |
| 138 |
@@ -44,6 +44,20 @@ RDEPEND=" |
| 139 |
${DEPEND} |
| 140 |
" |
| 141 |
|
| 142 |
+src_prepare() { |
| 143 |
+ cmake_src_prepare |
| 144 |
+} |
| 145 |
+ |
| 146 |
+src_configure() { |
| 147 |
+ append-ldflags -Wl,-z,noexecstack |
| 148 |
+ cmake_src_configure |
| 149 |
+} |
| 150 |
+ |
| 151 |
+src_compile() { |
| 152 |
+ tc-export AR |
| 153 |
+ cmake_src_compile |
| 154 |
+} |
| 155 |
+ |
| 156 |
pkg_postinst() { |
| 157 |
xdg_pkg_postinst |
Archives