summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/Manifest.gzbin68403 -> 68408 bytes
-rw-r--r--dev-util/ROPgadget/Manifest4
-rw-r--r--dev-util/ROPgadget/ROPgadget-7.3.ebuild (renamed from dev-util/ROPgadget/ROPgadget-7.1.ebuild)2
-rw-r--r--dev-util/bitcoin-tx/Manifest4
-rw-r--r--dev-util/bitcoin-tx/bitcoin-tx-0.21.0-r2.ebuild (renamed from dev-util/bitcoin-tx/bitcoin-tx-0.21.0-r1.ebuild)3
-rw-r--r--dev-util/bitcoin-tx/bitcoin-tx-22.0-r2.ebuild (renamed from dev-util/bitcoin-tx/bitcoin-tx-22.0-r1.ebuild)3
-rw-r--r--dev-util/premake/Manifest10
-rw-r--r--dev-util/premake/files/premake-5.0.0-remove-hardcoded-libpath.patch113
-rw-r--r--dev-util/premake/files/premake-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch63
-rw-r--r--dev-util/premake/premake-3.7-r1.ebuild19
-rw-r--r--dev-util/premake/premake-4.4_beta5.ebuild36
-rw-r--r--dev-util/premake/premake-5.0.0_beta2.ebuild (renamed from dev-util/premake/premake-5.0.0_alpha16.ebuild)6
12 files changed, 127 insertions, 136 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 0a03067a0fe5..839841278034 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
Binary files differ
diff --git a/dev-util/ROPgadget/Manifest b/dev-util/ROPgadget/Manifest
index c1ee788b8917..fa7dcb9e970a 100644
--- a/dev-util/ROPgadget/Manifest
+++ b/dev-util/ROPgadget/Manifest
@@ -1,6 +1,6 @@
-DIST ROPgadget-7.1.gh.tar.gz 10092729 BLAKE2B dc06e99347987d9eb8b346a6a55599013b7d90b996cbd59f27721f26ce6e59a1ead7c0e3824fdb4fa4d215256d6ad378b2e6eec210561a217b2fa65b2efda169 SHA512 f86956108ba5f131a609026087d4d952cb106ed03e72b04844ae551bdf5902ff70b917bc7c2bcd256591142d4f03e3aef0ceca7ad0d325fb5663f892e27b4b70
DIST ROPgadget-7.2.gh.tar.gz 10092747 BLAKE2B 1a1de7ce06115c8ffb377d3e7c77a268d3e9a158ed9255c02f954da4a0c32732f741e7ca081fa0b75b9a5dce2fa099b8548f26d248ed0285a2290f88dadc848d SHA512 cc3f87a4a331a3c7799f197b8a9056d1da85697a47c57d03cc080aa61d6c8a00775e7f972082f92451439c36ef9d820c982194464f02ec041b5bbeb97fa26f9a
-EBUILD ROPgadget-7.1.ebuild 784 BLAKE2B 86702ae11590627a20831957c7df7c5e82d08bfb7f6a2514fb6ea45c938bbcc85c5b7e819e64988d3908302cbe254d6ec19a731307841b2fed71ff233bd384c8 SHA512 8dac20d41a70474015a2cf9a61e8857f13d680488ea778acdceed057cadc75a4ce427281545cfe047d8781a9fbc303b28aa5c4a59b9109a0a1d06f33eb7d2499
+DIST ROPgadget-7.3.gh.tar.gz 10105592 BLAKE2B b5bfa7bbac6875c2a417c65f3415603c07fda64f96416bba7fc4d6ea653c81b97b7dc4d8573ad53f3353862a218afb15aeaf238880d82a568b6cbe1bb276eb99 SHA512 58457f77c24a1cc4cc703c75aed9303f63ce3eba699210239603e274f134ec06d73b2c519b78176fcaaf6794a81c5a59bb9bafeaa429f7085443372e1087e173
EBUILD ROPgadget-7.2.ebuild 798 BLAKE2B 43e7e175b68737f065cf0744ad838bcee3a538d096eb1e68267af3b3726f29fdb3d57d4857470360578e4d1e0680fd560954f96b7bfa603fa8460a6a61b7b4c4 SHA512 869af184c90e1a702d8c3e7b9f568cd770303978f594c4e232cb8ce5c1bdaf5637378fd226a1820eebe031230adac188366445affba87ceaf1b9a5f18b8aae56
+EBUILD ROPgadget-7.3.ebuild 800 BLAKE2B 3b6d30a0c542ceac23f7732c12446b1ec7ff3eb769095f308ad5184da1cb3d2e0402ed4ca32300b175be8d816e40529739e10166abebc65702a1563ca4a6b316 SHA512 187566981dae923ec1dc0f8cc1d21297949a0b1f95d18825cbd0b743b5f90be45d800306aef982267b2b750075458b6e9f4c8074b0df5ce78a086522591ccd5a
EBUILD ROPgadget-9999.ebuild 800 BLAKE2B 3b6d30a0c542ceac23f7732c12446b1ec7ff3eb769095f308ad5184da1cb3d2e0402ed4ca32300b175be8d816e40529739e10166abebc65702a1563ca4a6b316 SHA512 187566981dae923ec1dc0f8cc1d21297949a0b1f95d18825cbd0b743b5f90be45d800306aef982267b2b750075458b6e9f4c8074b0df5ce78a086522591ccd5a
MISC metadata.xml 894 BLAKE2B 5b46ce7117f8bf1adc0fcae940bcb693b2efe1d46469627e28cf2b6375d9c0952968c69dbda53e4d6190c13e47010127caffa63f3f9a68fd28ede9970d841445 SHA512 2c198345cebbd725e2ba634d8b72efb7e62209fc38c12c05e3cb2ce949e9ed870e0b937096a16e2e75bbbd298a1ec5376e49d79b6992ed775061742ca60a088c
diff --git a/dev-util/ROPgadget/ROPgadget-7.1.ebuild b/dev-util/ROPgadget/ROPgadget-7.3.ebuild
index ea1bc21225ed..ec2cad9d2931 100644
--- a/dev-util/ROPgadget/ROPgadget-7.1.ebuild
+++ b/dev-util/ROPgadget/ROPgadget-7.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/JonathanSalwan/ROPgadget"
else
SRC_URI="https://github.com/JonathanSalwan/ROPgadget/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
- KEYWORDS="amd64 ~arm64 x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
fi
LICENSE="GPL-2"
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index d98485148068..838b4c1c46f9 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -5,7 +5,7 @@ DIST bitcoin-22.0.knots20211108.patches.tar.xz 1318256 BLAKE2B d6e56bc0ca1d706e9
DIST bitcoin-24.0.1.tar.gz 11412628 BLAKE2B 2a8c83aecd12d8d40305d78ede1f389884ee62cfe4af39a9b416b8887a595f3393d599ebe9ddeb576bba5896923feb7ee45ba32d7d4cb0ce9e6d0ef39ecf83c7 SHA512 de1ddb543429f70b0b55a46500e0bc4807cca1b1655a28f8ab186d6f6e620f8cf82420bbdf412976ffed9bc6d742926b19933429c734edaf7430a4f8c37e1685
DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f
DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa93e4a34097eafea39734a6f4e25fa6b174f894655f63c504380d8761657771795bfcc641018bf1f1661deef9321 SHA512 1b4b17360e97f390ae678adb7a239c359d3a1288799710683e26f09fc53341b6fca3211465fa3e4fdee37324d85ec1a31ffd1a3714e969df13441f755fa4b7ad
-EBUILD bitcoin-tx-0.21.0-r1.ebuild 2433 BLAKE2B 821110cbf17513d6181d55b9135dfe79716bedcdac6870fc2ef21def2c3095022ddbb239c7713ab46cb0d9ad8da63389bdbf3bbe3cc55934bc26a3c92e561b92 SHA512 00a14386117b0abaed1df882b0256254022b70ec8785219f81aab6346836518bbf0ee463fdec00601d23d42967ee6229b0b59fbea1d02cc331327e76b8ec0584
-EBUILD bitcoin-tx-22.0-r1.ebuild 2697 BLAKE2B 3d35dd7fad313080bde6653d6b44e75c5cfaa0d7589f4d8b4096c2184b82c6e47b10289f4dacd0a6298d0e20645ee237619ba7b9f16ab9299cac85478633486d SHA512 aa0dfd62f571b883062ddef2f209022b8b4d3dc7a4048a945348bda40bb143fcd1a87f3792926f26b5bfad13c0e2bad966ee3c65567750e322b0ba477c764be2
+EBUILD bitcoin-tx-0.21.0-r2.ebuild 2477 BLAKE2B 29c4ac0ef985767c0c3d22013777ceb5edb29a53f4436ea0141da679c5dd6eea82dd019d7ad73891e0ebde862f60bfe291d337a2da2111724b28edc07b13b295 SHA512 6a501c4705757736422ebffb264c8cdf09b6e17c2327e113c85ba330067ffdebd990725dda191cbce7dcb80840567ef4e7c095f55a5a5e4033e3c65f51e63cca
+EBUILD bitcoin-tx-22.0-r2.ebuild 2741 BLAKE2B 56742837a3b542f1760d0f6122ace4762aeb85ff44dc8d321afce019d7e705aefd73d1c9c3a44a3410339192a2f99653d925673ce1a62fff1b1dae3fa302466f SHA512 bcb0f588aa503aca0ffe1ff6072703a859180cde9748bf15e4a8975ffd55a3fe4484995e07213f2d322790aea51785e3b9321511d21133aec7c26b1b4fc2489f
EBUILD bitcoin-tx-24.0.1-r1.ebuild 1603 BLAKE2B f039794b2a7f4d42d1ad7b74d6295426a8e1f88f08c496b254e1c008d3ac37cd423bc6fe4c9bde0b42f082905cb1124a86cd3ce37dfec3f5f02bbd9069e83719 SHA512 be3110288a0f41bb7bbba5e6b4f327c7187482e499bc922ebeefb41958be24433e1cfa7df17a862698a182a4e028f5b7c801813fbfd0761de3c1d9d22cd397b0
MISC metadata.xml 651 BLAKE2B 33a308d2af3a2418cfed88e8a50b1a7f160c3f9ccb7d65acef717cad7bbad0dd8fe0577a6fbe606a354f6458074ed3471ac7672737c8892ac5c67f41ef47ed2f SHA512 303af395b2ef63071c84925ccd94a79f441fa2d32efb78b218c2846be6ae8777949823d205f8073c48ff73746adbec8cf05f76ec90a7f26601cd427335f1fff7
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.21.0-r1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.21.0-r2.ebuild
index 0d5b506d3da1..865fc9b4f6ab 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.21.0-r1.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.21.0-r2.ebuild
@@ -23,7 +23,8 @@ IUSE="knots"
DEPEND="
dev-libs/boost:=
- ~dev-libs/libsecp256k1-0.1_pre20201028:=[recovery,schnorr]
+ >dev-libs/libsecp256k1-0.1_pre20200911:0/0[recovery,schnorr]
+ !>=dev-libs/libsecp256k1-0.1_pre20210628
>=dev-libs/univalue-1.0.4:=
"
RDEPEND="${DEPEND}"
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-22.0-r1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-22.0-r2.ebuild
index 7d8aa96f012e..cbf1068adebf 100644
--- a/dev-util/bitcoin-tx/bitcoin-tx-22.0-r1.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-22.0-r2.ebuild
@@ -23,7 +23,8 @@ IUSE="knots"
RDEPEND="
dev-libs/boost:=
- ~dev-libs/libsecp256k1-0.1_pre20201028:=[recovery,schnorr]
+ >dev-libs/libsecp256k1-0.1_pre20200911:0/0[recovery,schnorr]
+ !>=dev-libs/libsecp256k1-0.1_pre20210628
>=dev-libs/univalue-1.0.4:=
"
DEPEND="${RDEPEND}"
diff --git a/dev-util/premake/Manifest b/dev-util/premake/Manifest
index b45ba902ac2a..bab3e2edb39d 100644
--- a/dev-util/premake/Manifest
+++ b/dev-util/premake/Manifest
@@ -1,11 +1,7 @@
AUX archless.patch 1516 BLAKE2B 6a4b335cc41f466a45170b016da0e26c7d5b955c8d0fdb118bb90370663711ea42e66308e455dbc671eee2a29c4999f2628c416e30491825d8ccac151b3bec65 SHA512 e74f895b24a7bb3da118aa694c35b2473994881ffa6e54ec5a0be450ab55374c0bb418b93fa84b5e30f46a04987c1cb75305463a1a181e458c750d38cafecd04
-AUX premake-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch 2814 BLAKE2B 3fd9affab496c3cfe3b49db672a3dd705c7592502d3d12ad203bf7034ce79d9de69266ba9358016656792b929a99eece12fbec41f223f0e21fb40b73ed9cec40 SHA512 0ab6979eada5a917f6cde6189ead0112c273e496662445d4b00a27a362361e57664cca1480c163cd157f87769c12f07a6bcbd5f737b38475885780bc2ae5ca53
+AUX premake-5.0.0-remove-hardcoded-libpath.patch 3334 BLAKE2B 0dcb4101af388c0ceb23e89f5f45d11042bf4dfe155106eb32ff19edcb8d562c32dee1c8a23504dd17c4520679fb7dc6ce7ad712f1f837a08d7c8b58ab89d122 SHA512 a045f5b1e0bff31a068ec5d33678d1c4b030c30b98d09cc09258b86a24516053e3e9c0267ff7a47cea05d580540c167d5bcafd1bb2dacdf7d3f42df188061d95
DIST premake-4.3-src.zip 514366 BLAKE2B 5079f9d7c5dbe46d60149ec7c01523eaca5ab3cccce9f2f66d05905152ceb0b8bddaf181624288b722dd1534da6aef256ed5bb997db448f1499c8ab989277bc6 SHA512 df3a4f1e04afb6ae9acf06c063b084a4bcc7c48a98eebeb242eafef40de4097c6a6fe549369d9538b93efea35244222b9d26c15824f126a67b8f80abaecdf001
-DIST premake-4.4-beta5-src.zip 596883 BLAKE2B f4bf2b75946b6a442aced79f1f29b08e61bfa34c1e30c64aa59a6fed9c4c35aaca996fd0e8b728e839c24e74eae9f23ac3c99406361a061f0fa5dc04ce3ce9aa SHA512 47a2c26d3c45578cb2cbae96ec1b647298824d08584e2610aacd038e21069297a1f5b3366340cf781d29827555ff4d955651f70cdc2d36b99808fddf52e7a242
-DIST premake-5.0.0_alpha16.tar.gz 6462956 BLAKE2B 27c27eeef77986f6e8244ecd1a08e19d753dafcd0292d593ac758e04c2cb2307e05aaf325d2afc6ad8936ab2bbd97af6269841b9b7489b50dd4ce56e39120f05 SHA512 7ddb5ffe48484157336c7309fb611d34ff670fb20f92da309af3a4ae6f664a4b8abd2c0575036abbed1e346b155a03bf6fbac0587b47d5c97d9a22f08dd2deea
-DIST premake-src-3.7.zip 427727 BLAKE2B 2f9cc7b045f75ceb52a8e71507cb5576f042a93be4f6c097e8bc1166e3bbb9e271a02f5fbd648f79e0d24867a09bba9ac72a268fdc47140219c5d6a36cda1a16 SHA512 351b26b9ee738e97b1828e7c26fe1538fb1509fbdc030da3d87fc28b1daa7966bc50ba8043062d35b37fa3929d909533b723241e1f98e438a039c6f9d61a46f4
-EBUILD premake-3.7-r1.ebuild 389 BLAKE2B 12a26f7da1d016d762b51e1ac7f703f4dbe72c1f22eb5259affb8244286ba4018be6e9eb7acfd07573950726401b1d74315b42bb5f5331e5cbbacc2c499591aa SHA512 dad1c9e2143d633b7becb624babb63af459cb7c9ecd5105e11854703f91e68c88dd91e43e9a5aa894d21e8c0f6eaaa1f0df01b4c0f4bf1992d14c08c270efc39
+DIST premake-5.0.0_beta2.tar.gz 6491805 BLAKE2B 1e5245ded3c36b61afd9339351ae2250cebd488a3723c1844b98a8bcf257a3a33102483d5b830a264aff7371b40edcac7dca18dbaacb0dffeb6e43d69e5d6a4c SHA512 0385e2859ed8873f78e2e8e4a57112c9ec5ff5ef6c456caa7a96b9fc372f148cec9c745e19cac7daee6c55820e86e55224737aa172e2134c169303829c1080eb
EBUILD premake-4.3-r2.ebuild 463 BLAKE2B c4783cbf2d86ec85af56000494b9dc321d25914881caf416f986002ec7e4452c70af828fdff8331be899a026f937edd0c3113fc83f93256a5dcce08fd475a677 SHA512 8a9f5e4e4690e00faf4e7815bd27940c9a310eafd45ec78b85702e98ddb0f8f7444a903125e4a4d387b7855fe08375a191eba5e124bc705bb415cea8a0c92fb1
-EBUILD premake-4.4_beta5.ebuild 610 BLAKE2B 576418d3d18c1fc2f3a020368711ae33f19cd65c7e0c9300a084fa165cb57e028ef224c9abc2044801f8c247acf80d79b418dedf69a82f867355446629d93875 SHA512 43709cba1c064040a61423808e75dc5d490807a89cffdae21068fa12855a2f1386be90a4d5c975eab370242b1aba41cfce58e1a92d8e8bb94ecf9d7cb6807d75
-EBUILD premake-5.0.0_alpha16.ebuild 699 BLAKE2B 0ae5d55430621930b00b87ec3ab11524af714e8e5f4c1e75c3984162f3e86292558261f057d07196a790ea45da252795a1b61bea82f2b88fc1ed1313f77fee37 SHA512 45217a60a4f9d4e14003fbe0452b48c2abcd11517eddeca90b20ca6182dd83e99494f6e6c659967752b3f404585ebd5af297682bb8f859a813c40254aecc1b9d
+EBUILD premake-5.0.0_beta2.ebuild 693 BLAKE2B 267d500f5566644426bea8c323e4e124238c091972cb4e553f8d152491587ec3f5b4e574fc9d8d00f3a065cf0428acf0380019b4c836fe5a2e5533cd2a0a600f SHA512 3a0b8b70e9936eb7a2628fedb2b4ff4b45a07271d6ccdd0f40ab00a078907ad8569ec08bb157d2716e99d99970811c980cfded72cce9f2b66eaaa50c5ba05a53
MISC metadata.xml 771 BLAKE2B 6a8c2ca614ad4e799efcbc4b30be952160df8ec9b6ce0a2a179a98b5cd1520515a4abef4f0815221a81e03eac86b16728a8474d3e3d0df1aaa038fe7d8a6a977 SHA512 ceb9e5f086a4ac803c1aa901b45fbc9a37a6dd75b5c573ad49772413631c897b54cd53b2873b42c91b000a087e48dc13300a9b945292b848a0f462a738f689b0
diff --git a/dev-util/premake/files/premake-5.0.0-remove-hardcoded-libpath.patch b/dev-util/premake/files/premake-5.0.0-remove-hardcoded-libpath.patch
new file mode 100644
index 000000000000..4c7a377ba6c7
--- /dev/null
+++ b/dev-util/premake/files/premake-5.0.0-remove-hardcoded-libpath.patch
@@ -0,0 +1,113 @@
+Remove the hardcoded -L/usr/lib and -L/usr/lib64
+This is not needed, and will cause issues:
+https://github.com/gentoo/gentoo/pull/25825#issuecomment-1179497476
+Index: premake-core-5.0.0-beta2/modules/d/tools/dmd.lua
+===================================================================
+--- premake-core-5.0.0-beta2.orig/modules/d/tools/dmd.lua
++++ premake-core-5.0.0-beta2/modules/d/tools/dmd.lua
+@@ -52,8 +52,8 @@
+
+ tdmd.gcc.libraryDirectories = {
+ architecture = {
+- x86 = "-L-L/usr/lib",
+- x86_64 = "-L-L/usr/lib64",
++ x86 = "",
++ x86_64 = "",
+ }
+ }
+
+Index: premake-core-5.0.0-beta2/modules/d/tools/gdc.lua
+===================================================================
+--- premake-core-5.0.0-beta2.orig/modules/d/tools/gdc.lua
++++ premake-core-5.0.0-beta2/modules/d/tools/gdc.lua
+@@ -228,8 +228,8 @@
+
+ gdc.libraryDirectories = {
+ architecture = {
+- x86 = "-L/usr/lib",
+- x86_64 = "-L/usr/lib64",
++ x86 = "",
++ x86_64 = "",
+ }
+ }
+
+Index: premake-core-5.0.0-beta2/modules/d/tools/ldc.lua
+===================================================================
+--- premake-core-5.0.0-beta2.orig/modules/d/tools/ldc.lua
++++ premake-core-5.0.0-beta2/modules/d/tools/ldc.lua
+@@ -323,8 +323,8 @@
+
+ ldc.libraryDirectories = {
+ architecture = {
+- x86 = "-L=-L/usr/lib",
+- x86_64 = "-L=-L/usr/lib64",
++ x86 = "",
++ x86_64 = "",
+ }
+ }
+
+Index: premake-core-5.0.0-beta2/modules/gmake/tests/cpp/test_ldflags.lua
+===================================================================
+--- premake-core-5.0.0-beta2.orig/modules/gmake/tests/cpp/test_ldflags.lua
++++ premake-core-5.0.0-beta2/modules/gmake/tests/cpp/test_ldflags.lua
+@@ -55,7 +55,7 @@
+ system (p.LINUX)
+ prepare()
+ test.capture [[
+- ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64
++ ALL_LDFLAGS += $(LDFLAGS) -m64
+ ]]
+ end
+
+@@ -64,7 +64,7 @@
+ system (p.LINUX)
+ prepare()
+ test.capture [[
+- ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32
++ ALL_LDFLAGS += $(LDFLAGS) -m32
+ ]]
+ end
+
+Index: premake-core-5.0.0-beta2/modules/gmake2/tests/test_gmake2_ldflags.lua
+===================================================================
+--- premake-core-5.0.0-beta2.orig/modules/gmake2/tests/test_gmake2_ldflags.lua
++++ premake-core-5.0.0-beta2/modules/gmake2/tests/test_gmake2_ldflags.lua
+@@ -56,7 +56,7 @@ ALL_LDFLAGS += $(LDFLAGS) -L../libs -Lli
+ system (p.LINUX)
+ prepare()
+ test.capture [[
+-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64
++ALL_LDFLAGS += $(LDFLAGS) -m64
+ ]]
+ end
+
+@@ -65,7 +65,7 @@ ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -
+ system (p.LINUX)
+ prepare()
+ test.capture [[
+-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32
++ALL_LDFLAGS += $(LDFLAGS) -m32
+ ]]
+ end
+
+Index: premake-core-5.0.0-beta2/src/tools/gcc.lua
+===================================================================
+--- premake-core-5.0.0-beta2.orig/src/tools/gcc.lua
++++ premake-core-5.0.0-beta2/src/tools/gcc.lua
+@@ -477,16 +477,10 @@
+ architecture = {
+ x86 = function (cfg)
+ local r = {}
+- if not table.contains(os.getSystemTags(cfg.system), "darwin") then
+- table.insert (r, "-L/usr/lib32")
+- end
+ return r
+ end,
+ x86_64 = function (cfg)
+ local r = {}
+- if not table.contains(os.getSystemTags(cfg.system), "darwin") then
+- table.insert (r, "-L/usr/lib64")
+- end
+ return r
+ end,
+ },
diff --git a/dev-util/premake/files/premake-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch b/dev-util/premake/files/premake-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch
deleted file mode 100644
index 766d2aea71b4..000000000000
--- a/dev-util/premake/files/premake-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-https://bugs.gentoo.org/773505
-
-From 89d8c74f0c9ba77aaa12799a9d2dc397eac4ece6 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 15 Aug 2021 21:47:20 +0100
-Subject: [PATCH] Respect MAKEOPTS jobs
-
----
- Bootstrap.mak | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/Bootstrap.mak b/Bootstrap.mak
-index 06e0f20..2d59068 100644
---- a/Bootstrap.mak
-+++ b/Bootstrap.mak
-@@ -101,7 +101,7 @@ osx: osx-clean
- $(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_MACOSX -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" -framework CoreServices -framework Foundation -framework Security -lreadline $(SRC)
- ./build/bootstrap/premake_bootstrap embed
- ./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
-- $(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)
-+ $(MAKE) -C build/bootstrap config=$(CONFIG)
-
- linux-clean: nix-clean
-
-@@ -110,7 +110,7 @@ linux: linux-clean
- $(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lm -ldl -lrt
- ./build/bootstrap/premake_bootstrap embed
- ./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
-- $(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)
-+ $(MAKE) -C build/bootstrap config=$(CONFIG)
-
- bsd-clean: nix-clean
-
-@@ -119,7 +119,7 @@ bsd: bsd-clean
- $(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lm
- ./build/bootstrap/premake_bootstrap embed
- ./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
-- $(MAKE) -C build/bootstrap -j`getconf NPROCESSORS_ONLN` config=$(CONFIG)
-+ $(MAKE) -C build/bootstrap config=$(CONFIG)
-
- solaris-clean: nix-clean
-
-@@ -128,7 +128,7 @@ solaris: solaris-clean
- $(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lm
- ./build/bootstrap/premake_bootstrap embed
- ./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
-- $(MAKE) -C build/bootstrap -j`getconf NPROCESSORS_ONLN` config=$(CONFIG)
-+ $(MAKE) -C build/bootstrap config=$(CONFIG)
-
- haiku-clean: nix-clean
-
-@@ -137,7 +137,7 @@ haiku: haiku-clean
- $(CC) -o build/bootstrap/premake_bootstrap -DPREMAKE_NO_BUILTIN_SCRIPTS -DLUA_USE_POSIX -DLUA_USE_DLOPEN -D_BSD_SOURCE -I"$(LUA_DIR)" -I"$(LUASHIM_DIR)" $(SRC) -lbsd
- ./build/bootstrap/premake_bootstrap embed
- ./build/bootstrap/premake_bootstrap --to=build/bootstrap gmake2
-- $(MAKE) -C build/bootstrap -j`getconf _NPROCESSORS_ONLN` config=$(CONFIG)
-+ $(MAKE) -C build/bootstrap config=$(CONFIG)
-
- windows-base: windows-clean
- if not exist build\bootstrap (mkdir build\bootstrap)
---
-2.32.0
-
diff --git a/dev-util/premake/premake-3.7-r1.ebuild b/dev-util/premake/premake-3.7-r1.ebuild
deleted file mode 100644
index ae7f896f0a9c..000000000000
--- a/dev-util/premake/premake-3.7-r1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="A makefile generation tool"
-HOMEPAGE="http://industriousone.com/premake"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip"
-S="${WORKDIR}/${P/p/P}"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="amd64 x86"
-
-BDEPEND="app-arch/unzip"
-
-src_install() {
- dobin bin/${PN}
-}
diff --git a/dev-util/premake/premake-4.4_beta5.ebuild b/dev-util/premake/premake-4.4_beta5.ebuild
deleted file mode 100644
index 68325bfb5d3b..000000000000
--- a/dev-util/premake/premake-4.4_beta5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${P/_/-}
-
-inherit versionator
-
-DESCRIPTION="A makefile generation tool"
-HOMEPAGE="https://premake.github.io/"
-SRC_URI="mirror://sourceforge/premake/${MY_P}-src.zip"
-
-LICENSE="BSD"
-SLOT=$(get_major_version)
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
-
- sed 's/$(ARCH) //g' -i build/gmake.unix/Premake4.make || die
-}
-
-src_compile() {
- emake -C build/gmake.unix/
-}
-
-src_install() {
- dobin bin/release/premake${SLOT}
-
- einstalldocs
-}
diff --git a/dev-util/premake/premake-5.0.0_alpha16.ebuild b/dev-util/premake/premake-5.0.0_beta2.ebuild
index eea76fb7ca0e..56b499a53419 100644
--- a/dev-util/premake/premake-5.0.0_alpha16.ebuild
+++ b/dev-util/premake/premake-5.0.0_beta2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,9 +16,7 @@ LICENSE="BSD"
SLOT="5"
KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-PATCHES=(
- "${FILESDIR}"/${PN}-5.0.0_alpha16-respect-MAKEOPTS-jobs.patch
-)
+PATCHES=( "${FILESDIR}/${PN}-5.0.0-remove-hardcoded-libpath.patch" )
src_compile() {
# bug #773505
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-21 11:18:37 +0000