From c35d2fa307be7bfbe9745c3fc7224d4c66267892 Mon Sep 17 00:00:00 2001 From: Julien Roy Date: Fri, 8 Apr 2022 23:36:29 -0400 Subject: [PATCH 01/17] dev-libs/luksmeta: Add comments to give context to the patch Signed-off-by: Julien Roy --- dev-libs/luksmeta/files/luksmeta-tests.patch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dev-libs/luksmeta/files/luksmeta-tests.patch b/dev-libs/luksmeta/files/luksmeta-tests.patch index 27baf71400..aeca588619 100644 --- a/dev-libs/luksmeta/files/luksmeta-tests.patch +++ b/dev-libs/luksmeta/files/luksmeta-tests.patch @@ -1,3 +1,7 @@ +# Closes Gentoo bug 837308 +# This patch backports the master branch's test-lm-{big,one,two}.c and test-luksmeta.c +# due to failing tests on v9 tag (see https://bugs.gentoo.org/837308) + diff --git a/test-lm-assumptions.c b/test-lm-assumptions.c index d9ff20b..b4f293f 100644 --- a/test-lm-assumptions.c From eee5f79450fbed360132e925d2eccbd92a424aa7 Mon Sep 17 00:00:00 2001 From: Dex Conner Date: Fri, 8 Apr 2022 23:49:53 +0300 Subject: [PATCH 02/17] app-misc/lf: Use domenu instead of doins Signed-off-by: Dex Conner --- app-misc/lf/lf-27.ebuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app-misc/lf/lf-27.ebuild b/app-misc/lf/lf-27.ebuild index adf2a1a297..3f617c0281 100644 --- a/app-misc/lf/lf-27.ebuild +++ b/app-misc/lf/lf-27.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit go-module bash-completion-r1 +inherit go-module bash-completion-r1 desktop EGO_SUM=( "github.com/gdamore/encoding v1.0.0" @@ -79,7 +79,6 @@ src_install() { doins "etc/${PN}cd.fish" use X && { - insinto /usr/share/applications - doins "${PN}.desktop" + domenu "${PN}.desktop" } } From 289d837890489aa98feaada08ceaa25928f41221 Mon Sep 17 00:00:00 2001 From: Dex Conner Date: Fri, 8 Apr 2022 23:56:07 +0300 Subject: [PATCH 03/17] app-misc/lf: Stop using X flag for desktop file Signed-off-by: Dex Conner --- app-misc/lf/lf-27.ebuild | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app-misc/lf/lf-27.ebuild b/app-misc/lf/lf-27.ebuild index 3f617c0281..0997fbe0f7 100644 --- a/app-misc/lf/lf-27.ebuild +++ b/app-misc/lf/lf-27.ebuild @@ -34,7 +34,7 @@ SRC_URI="https://github.com/gokcehan/lf/archive/r${PV}.tar.gz -> ${P}.tar.gz DESCRIPTION="Terminal file manager" HOMEPAGE="https://github.com/gokcehan/lf" -IUSE="+static X" +IUSE="+static" KEYWORDS="~amd64 ~arm ~arm64 ~x86" LICENSE="MIT" @@ -78,7 +78,5 @@ src_install() { insinto /usr/share/fish/vendor_functions.d doins "etc/${PN}cd.fish" - use X && { - domenu "${PN}.desktop" - } + domenu "${PN}.desktop" } From c661464bbbbb2498ff958c6c3cff2cf3c777056e Mon Sep 17 00:00:00 2001 From: Dex Conner Date: Fri, 8 Apr 2022 23:59:13 +0300 Subject: [PATCH 04/17] app-misc/lf: Use dependency tarball not EGO_SUM Signed-off-by: Dex Conner --- app-misc/lf/Manifest | 5 +---- app-misc/lf/lf-27.ebuild | 30 +++--------------------------- 2 files changed, 4 insertions(+), 31 deletions(-) diff --git a/app-misc/lf/Manifest b/app-misc/lf/Manifest index 9debee9c44..43126ae94a 100644 --- a/app-misc/lf/Manifest +++ b/app-misc/lf/Manifest @@ -2,8 +2,6 @@ DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod 77 BLAKE2B 1b81c4c20a8900 DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip 19867 BLAKE2B a772206ce6dc48b32d7125a25b26694325d367ebcbad85466b2e6cfdb9fc9f0e08b98b7ecede5397344e5f7e623c4c76edcf69dcee99917adccf5b31aad80bf8 SHA512 127767c725e376b43fe4e2003ddc12fe89693d6d7e52b01e6d47d73fd04496decc0fd60b64c7a65303428e00a52ece1848610ea35231789a814187ef8503bee3 DIST github.com%2Fgdamore%2Ftcell%2Fv2%2F@v%2Fv2.0.0.mod 253 BLAKE2B 972ed39f4848b39eac6662d8f0f3dfc1ff4ec14f5da35fb8c41ada758932df35d4bdc1cf1fd91e54626ae74fc1cdfbbaf93261d793ce828f6a08d0120b5168ed SHA512 8d9fcc68e635c163c1f3f29367988ed5af2d3a2a9acd0c142cc95571bb920618d09e828aa0bf26718c330e5e199d66f2c6c618cab20618ca00be284b013dd833 DIST github.com%2Fgdamore%2Ftcell%2Fv2%2F@v%2Fv2.0.0.zip 219838 BLAKE2B e6d587643ad89f8428931a5aa9dd085a028bf5de1ae01ee5cb9e54b93cb760b81be79f54d2f555afeffe5846915f11f58037be20948e782e3089e0f2937ee3bf SHA512 6992b07bfe24152dd8b867bef52be9fdd17da27d0007ed4fc1c3701d3060bbc71854709ce74456a8d280949abd5b3224f1daf92f18c4a36b89bb78ccbbb16aac -DIST github.com%2Fgdamore%2Ftcell%2Fv2%2F@v%2Fv2.3.1.mod 308 BLAKE2B f53f87ed7d2310c09408d55be26ed053edd625203a7d860da4136849e5d44c6cb9cdd025b8b5d5d58b8649a3dadde10ed8861df75aa9e36989bf45549375c8ed SHA512 933a68f338fab6b8676db5abef19e3d521b546051dc8459cf11cca1bcedbdff94ee93bb0cde94e84c72f75ab1a2ee724ae3d0a2b116f9ec827862cd9a882d21c -DIST github.com%2Fgdamore%2Ftcell%2Fv2%2F@v%2Fv2.3.1.zip 222653 BLAKE2B 089865a73e6ac2b533b9fdb33885a1ed3464ef2ce808d95e8bc338735986ecfce06411cd3a83424dc5f016203dbdb424c2d58d6c211c1ba6081f0441f68ee5d0 SHA512 910b269598fa879e547e372e8fdcafd52ad20669f8ac97b1ae746b9c2fdbcf308dd69bd6b6f2737f62b40573b1e4160685bfc613a6786668beb7aa080436d72e DIST github.com%2Fgokcehan%2Ftcell%2Fv2%2F@v%2Fv2.2.1-0.20210329222449-4dd2d52e83ef.mod 308 BLAKE2B f53f87ed7d2310c09408d55be26ed053edd625203a7d860da4136849e5d44c6cb9cdd025b8b5d5d58b8649a3dadde10ed8861df75aa9e36989bf45549375c8ed SHA512 933a68f338fab6b8676db5abef19e3d521b546051dc8459cf11cca1bcedbdff94ee93bb0cde94e84c72f75ab1a2ee724ae3d0a2b116f9ec827862cd9a882d21c DIST github.com%2Fgokcehan%2Ftcell%2Fv2%2F@v%2Fv2.2.1-0.20210329222449-4dd2d52e83ef.zip 227557 BLAKE2B 6d3a65a1d8a4e3944cb8bf562c52e52f933afe03bc508236126a20cd14e59c3439b5fea5814602a987abaa263a2d326f393ece6bd7fbc29b870f7e7228884d1a SHA512 4721e4fb265bcac520c5ef82eff0853671740915a31cb431136bb31c946a0bf6070680aaeb3d53c87f0b524545752069e8627c92425607101f1770cdada6906d DIST github.com%2Flucasb-eyer%2Fgo-colorful%2F@v%2Fv1.0.3.mod 51 BLAKE2B be532e33c9a0e83b9d0b760b21d97ac83850299adb329f754f31e4b46dc7fb7a7157d2a41cdc258924ef8ee5c111a95ac3b0037d749cc936e1988a46612522cd SHA512 270b19446ac9a396f5ce7a000873928a44edb1457f86d294971dae08be37cd64ddb8edc0293e100ee60d56c504851aa69ab11db0b4cfd46649c5f79459e40011 @@ -19,8 +17,6 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.mod 33 BLAKE DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626150813-e07cf5db2756.zip 1810550 BLAKE2B e0bcc6235d88e1728797c178d10261e851b18814ecad679674349596f5fc0aa2784b0b4fee440488ffe8188b47dbf8474e5a5078b1220188ac6c25b0c371068d SHA512 98442115bb11ccc8061eb7c39e2e7efcc809d45ed6051456d6ec5439e20823b4b4d2ce16f4ba02530b58f74e9c1b9f3bf0d3dd0b4327b1b8158f395022ab2d80 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.zip 1529034 BLAKE2B a30815639bc723fe9c7078c1fc5214e43aa946520c8d2d1efdc2cfb88b53c1faf50054f693d4f3b92461a64c07c8dbb845901c87a8deb86650cfcfc0482aae08 SHA512 113ecd43b0aecd6050a3a7319bbb43d351e62d71f01f9b98af7ab15b179fff616ebbb81920447f3b1192a9230c230c95bb20e9172981d4c8b926804ee92af508 -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220209214540-3681064d5158.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655 -DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220209214540-3681064d5158.zip 1705205 BLAKE2B 7dbb357942b0c0b68473d25b05df1bfc47dc5af98b702a2a4f372409e669b631f99311146d4e4dfd7c15917c0fec6993134d44ef21407b8db615cd5f4aec2188 SHA512 541db3174ff73c4266f351e687a52c7d54bec4ff2320f4e2baf34d6327c46b46fac8156b602a97739aaa483a821b731a4579033bbc48e3a591bcf7970246cf15 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201210144234-2321bbc49cbf.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210220032956-6a3ed077a48d.zip 23402 BLAKE2B 03ef6b566c4f9539fe7310adff76e37bac4e3aaf32559f1a228690195207530ff68ad1179b22594cb7a62f9dcceb41631452052eb8bdab852848ffa1e19c0fbb SHA512 3aaf366b00d38d9dfe1ab23a0c6df05e2fb586f44470ec9b7cc59fc113cc68567a4102352b4a416da137df619b44c61e28042124cebcc525e3c6ebf10f8fbff2 @@ -29,5 +25,6 @@ DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec DIST gopkg.in%2Fdjherbis%2Ftimes.v1%2F@v%2Fv1.2.0.mod 34 BLAKE2B 994760ba91670807a6a9daa1781637b17e67721dc15124e262cfff7eb23a9bb7191d15925a7cf824a51ba6560816995ec24b3c175960e98669b41febbd69db5c SHA512 2983ea900dc8faee385d721e0d5062317f8d475c690d93d64b5863e7a0c8256077ed884b7dca284431af6696b0088a2a61bbf03aa19d14397f1a04b15f420bcc DIST gopkg.in%2Fdjherbis%2Ftimes.v1%2F@v%2Fv1.2.0.zip 16389 BLAKE2B 1b10d96f25305726184fe72c5f77a8d740a5e5d211fbc4cd78c89f8c5dac863ea24a940d3491c173879cd45e893f92565568a0f5c168fc2aad20e35141a6a12c SHA512 aca66545aa32b274864b4e84b6ef7284b5c63218f346230bf97587c69aaab6b9d5beb11ca3da9c1e9952b68ebc2fda974859757b91a66ede42d64339848ee069 DIST lf-22.tar.gz 102883 BLAKE2B 6e1357ba2038c383ddb6369bdf1f36c673964a34614423e6defeed8aa6094a7167436549bfd65d20ecd04b83ea618e3da7498ce0848ab98af778eb5628ff64ac SHA512 efdca3639d9042ad1ef84529b0b9be21cd8924ac094985b3d978046edb5e11303591a8bebc41df7b2837a3add196f94a8cc482a001a508c4fbc79ba1d2f8c54c +DIST lf-27-deps.tar.xz 12602056 BLAKE2B fec475a83988080468c8daabd4076a16f58eec610d71ad46ad7e5adf146c70d2e2ec78ede22c62b3353e668fd24f102c82a4b27f768153b4d003854734f92428 SHA512 74e3cbc98746669bc7f57bcf0b9a2d196795f0c8b011b33f1cf8afed7b7f3ef971c002df3f83985ca68b7980b4beec71569357123dbc31219542a04ff63295cd DIST lf-27.tar.gz 112266 BLAKE2B e03cd38042661d35dd7d110894fe7ca4866e491c810e76d6cfe1d34efedbda5f2b4b6e626ab72c72450252dca8f82c3e1804a686e7437d6f7475f3b9fa0ca796 SHA512 1a9cd0a3206f01f75a9ea0dbef4fcd3a2e28e9d283b19c74e821c5e90229b9ff64524e9d151dec44d9b2c06b3f8b424c4053034b58bcc7fa38345ce7c662f013 DIST lf-r20.tar.gz 101838 BLAKE2B 085b7331d65f3e93bf8c0767b08f528bb7f28f4432a25fd7b83eed270e17df4744433fe4e0d736eedfae04edb60dc6bf3663dcd403c0503c6ec4985009ad39b7 SHA512 7706950d11847638eaed3afa2c277945a18364781339d530d4c8829f0e4ec382f133aac43519237646b852a6899b28eb7279dc72f26833b50fdf2c4641ecc109 diff --git a/app-misc/lf/lf-27.ebuild b/app-misc/lf/lf-27.ebuild index 0997fbe0f7..b204f9178c 100644 --- a/app-misc/lf/lf-27.ebuild +++ b/app-misc/lf/lf-27.ebuild @@ -5,32 +5,8 @@ EAPI=7 inherit go-module bash-completion-r1 desktop -EGO_SUM=( - "github.com/gdamore/encoding v1.0.0" - "github.com/gdamore/encoding v1.0.0/go.mod" - "github.com/gdamore/tcell/v2 v2.3.1" - "github.com/gdamore/tcell/v2 v2.3.1/go.mod" - "github.com/lucasb-eyer/go-colorful v1.0.3" - "github.com/lucasb-eyer/go-colorful v1.0.3/go.mod" - "github.com/mattn/go-runewidth v0.0.10" - "github.com/mattn/go-runewidth v0.0.10/go.mod" - "github.com/rivo/uniseg v0.1.0" - "github.com/rivo/uniseg v0.1.0/go.mod" - "golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod" - "golang.org/x/sys v0.0.0-20220209214540-3681064d5158" - "golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod" - "golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod" - "golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d" - "golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod" - "golang.org/x/text v0.3.0" - "golang.org/x/text v0.3.0/go.mod" - "gopkg.in/djherbis/times.v1 v1.2.0" - "gopkg.in/djherbis/times.v1 v1.2.0/go.mod" -) - -go-module_set_globals -SRC_URI="https://github.com/gokcehan/lf/archive/r${PV}.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI}" +SRC_URI="https://github.com/gokcehan/lf/archive/r${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://github.com/cantcuckthis/gentoo-lf/raw/main/${P}-deps.tar.xz" DESCRIPTION="Terminal file manager" HOMEPAGE="https://github.com/gokcehan/lf" @@ -61,7 +37,7 @@ src_install() { doman "${PN}.1" - # bash & zsh + # bash & zsh cd insinto "/usr/share/${PN}" doins "etc/${PN}cd.sh" From 9fd0a44f8608183568f6829fa95a68b83f602fae Mon Sep 17 00:00:00 2001 From: Dex Conner Date: Sat, 9 Apr 2022 00:00:40 +0300 Subject: [PATCH 05/17] app-misc/lf: Fix ambigious comment Signed-off-by: Dex Conner --- app-misc/lf/lf-27.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-misc/lf/lf-27.ebuild b/app-misc/lf/lf-27.ebuild index b204f9178c..70aa483cb7 100644 --- a/app-misc/lf/lf-27.ebuild +++ b/app-misc/lf/lf-27.ebuild @@ -37,7 +37,7 @@ src_install() { doman "${PN}.1" - # bash & zsh cd + # bash & zsh cd script insinto "/usr/share/${PN}" doins "etc/${PN}cd.sh" From b353baa46e72630c1f0cd45ac92d3accbaca20dc Mon Sep 17 00:00:00 2001 From: Dex Conner Date: Sat, 9 Apr 2022 08:57:29 +0300 Subject: [PATCH 06/17] gui-wm/dwl: Replace doins with domenu Signed-off-by: Dex Conner --- gui-wm/dwl/dwl-0.3.ebuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gui-wm/dwl/dwl-0.3.ebuild b/gui-wm/dwl/dwl-0.3.ebuild index 285f36ac7f..6aaa4d363f 100644 --- a/gui-wm/dwl/dwl-0.3.ebuild +++ b/gui-wm/dwl/dwl-0.3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic savedconfig toolchain-funcs +inherit flag-o-matic savedconfig toolchain-funcs desktop DESCRIPTION="dwm for Wayland" HOMEPAGE="https://github.com/djpohly/dwl" @@ -42,8 +42,7 @@ src_configure() { src_install() { emake PREFIX="${ED}/usr" install - insinto /usr/share/wayland-sessions - doins "${FILESDIR}"/dwl.desktop + domenu "${FILESDIR}"/dwl.desktop einstalldocs From 263f1e2754ab6b80293d01c8f84034f83911d1a9 Mon Sep 17 00:00:00 2001 From: Dex Conner Date: Sat, 9 Apr 2022 09:20:36 +0300 Subject: [PATCH 07/17] gui-wm/dwl: Fix wlroots dependency version Signed-off-by: Dex Conner --- gui-wm/dwl/dwl-0.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui-wm/dwl/dwl-0.3.ebuild b/gui-wm/dwl/dwl-0.3.ebuild index 6aaa4d363f..79989a7d88 100644 --- a/gui-wm/dwl/dwl-0.3.ebuild +++ b/gui-wm/dwl/dwl-0.3.ebuild @@ -17,7 +17,7 @@ IUSE="X" RDEPEND=" dev-libs/libinput dev-libs/wayland - gui-libs/wlroots[X(-)?] + >=gui-libs/wlroots-0.15.1[X(-)?] x11-libs/libxcb x11-libs/libxkbcommon " From a33d6f330ca2ed4de966822261accdbb4d468582 Mon Sep 17 00:00:00 2001 From: Thiago Donato Ferreira Date: Sat, 9 Apr 2022 07:30:37 -0300 Subject: [PATCH 08/17] games-action/polymc: new package Signed-off-by: Thiago Donato Ferreira --- games-action/polymc/Manifest | 1 + games-action/polymc/metadata.xml | 17 +++++ games-action/polymc/polymc-1.1.1.ebuild | 93 +++++++++++++++++++++++++ games-action/polymc/polymc-9999.ebuild | 89 +++++++++++++++++++++++ 4 files changed, 200 insertions(+) create mode 100644 games-action/polymc/Manifest create mode 100644 games-action/polymc/metadata.xml create mode 100644 games-action/polymc/polymc-1.1.1.ebuild create mode 100644 games-action/polymc/polymc-9999.ebuild diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest new file mode 100644 index 0000000000..bb6f6641a8 --- /dev/null +++ b/games-action/polymc/Manifest @@ -0,0 +1 @@ +DIST PolyMC-1.1.1.tar.gz 5116164 BLAKE2B ca251cac3c8ea21de8a59297a0e637dac078d751476fec5fe86696df270c63ff079779056f016fa656506ea205bb7ace50ab6e0df190ffca14e43297b92292af SHA512 db32479e9e8a92ec61292c97281673b3084e1085d29b764214834de872d9eddf2ed1d2e383bcd79197e0c9321eec025af652b12c863596ff6abb0f5fba9a7af5 diff --git a/games-action/polymc/metadata.xml b/games-action/polymc/metadata.xml new file mode 100644 index 0000000000..a3aeebb29d --- /dev/null +++ b/games-action/polymc/metadata.xml @@ -0,0 +1,17 @@ + + + + + flowlnlnln@gmail.com + Thiago Donato Ferreira + + + swurl@swurl.xyz + Carson Rueter + + + https://github.com/PolyMC/PolyMC/issues + https://polymc.org/wiki/ + + PolyMC is a multi-instance Minecraft launcher focused on user freedom, redistributability, and simplicity. + diff --git a/games-action/polymc/polymc-1.1.1.ebuild b/games-action/polymc/polymc-1.1.1.ebuild new file mode 100644 index 0000000000..d93038a616 --- /dev/null +++ b/games-action/polymc/polymc-1.1.1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake java-pkg-2 optfeature xdg + +HOMEPAGE="https://polymc.org/" +DESCRIPTION="A custom, open source Minecraft launcher" + +MY_PN="PolyMC" + +# Let's use the vendored tarball to avoid dealing with the submodules directly +SRC_URI=" + https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz +" + +# GPL-3 for PolyMC +# LGPL-3 for libnbtplusplus +# LGPL-2.1 with linking exception for Quazip +LICENSE="GPL-3 LGPL-3 LGPL-2.1-with-linking-exception" + +SLOT="0" +KEYWORDS="amd64" + +IUSE="debug" + +QT_DEPS=" + >=dev-qt/qtcore-5.6.0:5 + >=dev-qt/qttest-5.6.0:5 + >=dev-qt/qtconcurrent-5.6.0:5 + >=dev-qt/qtgui-5.6.0:5 + >=dev-qt/qtnetwork-5.6.0:5 + >=dev-qt/qtwidgets-5.6.0:5 + >=dev-qt/qtxml-5.6.0:5 +" + +BDEPEND=" + ${QT_DEPS} + sys-libs/zlib + >=virtual/jdk-1.8.0:* + media-libs/libglvnd +" + +DEPEND=" + ${QT_DEPS} + >=virtual/jre-1.8.0:* + virtual/opengl +" + +RDEPEND="${DEPEND}" + +# We'll fetch the files from the GitHub archive directly, at least for now... +RESTRICT="mirror" + +# The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV} +S="${WORKDIR}/${MY_PN}-${PV}" + +src_prepare(){ + default + cmake_src_prepare +} + +src_configure(){ + if use debug; then + CMAKE_BUILD_TYPE=Debug + else + # Prepare for LTO in 1.2.0 (?) + # See https://github.com/PolyMC/PolyMC/pull/333 + CMAKE_BUILD_TYPE=Release + fi + + local mycmakeargs=( + # Do a system install + -DLauncher_PORTABLE=false + -DCMAKE_INSTALL_PREFIX="/usr" + # Resulting binary is named polymc + -DLauncher_APP_BINARY_NAME="${PN}" + ) + + cmake_src_configure +} + +src_compile(){ + cmake_src_compile +} + +pkg_postinst() { + xdg_pkg_postinst + + # https://github.com/PolyMC/PolyMC/issues/227 + optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr +} diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild new file mode 100644 index 0000000000..ae09f674bd --- /dev/null +++ b/games-action/polymc/polymc-9999.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake git-r3 java-pkg-2 optfeature xdg + +HOMEPAGE="https://polymc.org/" +DESCRIPTION="A custom, open source Minecraft launcher" + +EGIT_REPO_URI=" + https://github.com/PolyMC/PolyMC + https://github.com/MultiMC/libnbtplusplus + https://github.com/stachenov/quazip +" + +# GPL-3 for PolyMC +# LGPL-3 for libnbtplusplus +# LGPL-2.1 with linking exception for Quazip +LICENSE="GPL-3 LGPL-3 LGPL-2.1-with-linking-exception" + +SLOT="0" + +IUSE="debug" + +QT_DEPS=" + >=dev-qt/qtcore-5.6.0:5 + >=dev-qt/qttest-5.6.0:5 + >=dev-qt/qtconcurrent-5.6.0:5 + >=dev-qt/qtgui-5.6.0:5 + >=dev-qt/qtnetwork-5.6.0:5 + >=dev-qt/qtwidgets-5.6.0:5 + >=dev-qt/qtxml-5.6.0:5 +" + +BDEPEND=" + ${QT_DEPS} + sys-libs/zlib + >=virtual/jdk-1.8.0:* + media-libs/libglvnd +" + +DEPEND=" + ${QT_DEPS} + >=virtual/jre-1.8.0:* + virtual/opengl +" + +RDEPEND="${DEPEND}" + +src_prepare() { + if ${PV} != 9999; then + EGIT_COMMIT="${PV}" + fi + + git submodule init + git config submodule.libnbtplusplus.url "${WORKDIR}/libnbtplusplus" + git config submodule.quazip.url "${WORKDIR}/quazip" + git submodule update + + default + cmake_src_prepare +} + +src_configure(){ + if use debug; then + CMAKE_BUILD_TYPE=Debug + else + CMAKE_BUILD_TYPE=Release + fi + + local mycmakeargs=( + -DLauncher_PORTABLE=0 + -DCMAKE_INSTALL_PREFIX="/usr" + -DLauncher_APP_BINARY_NAME="${PN}" + ) + cmake_src_configure +} + +src_compile(){ + cmake_src_compile +} + +pkg_postinst() { + xdg_pkg_postinst + + # https://github.com/PolyMC/PolyMC/issues/227 + optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr +} From 324a6f2d5a7a44c378e9ea75c3df762a5e850d24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Duje=20Mihanovi=C4=87?= Date: Sat, 9 Apr 2022 13:35:44 +0200 Subject: [PATCH 09/17] games-fps/assaultcube: add fix-checkinstall.patch to git tree MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I somehow forgot to do this in commit 50e63d6 (games-fps/assaultcube: fix checkinstall.sh, server installation). Closes: https://bugs.gentoo.org/837311 Signed-off-by: Duje Mihanović --- .../assaultcube-1.3.0.2-fix-checkinstall.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 games-fps/assaultcube/files/assaultcube-1.3.0.2-fix-checkinstall.patch diff --git a/games-fps/assaultcube/files/assaultcube-1.3.0.2-fix-checkinstall.patch b/games-fps/assaultcube/files/assaultcube-1.3.0.2-fix-checkinstall.patch new file mode 100644 index 0000000000..9322c5d391 --- /dev/null +++ b/games-fps/assaultcube/files/assaultcube-1.3.0.2-fix-checkinstall.patch @@ -0,0 +1,13 @@ +diff --git a/check_install.sh b/check_install.sh +index 19f22ed..fb0bec9 100755 +--- a/check_install.sh ++++ b/check_install.sh +@@ -10,7 +10,7 @@ cd "$CUBE_DIR" + # check libs + + SERVERLIBS="libz" +-CLIENTLIBS="libSDL-1.2 libz libX11 libSDL_image libogg libvorbis libopenal" ++CLIENTLIBS="libSDL2-2.0 libz libX11 libSDL2_image libogg libvorbis libopenal" + + if [ -x "/sbin/ldconfig" ]; then + echo "checking libraries:" From 979851a0d50ee67aba4a31a72868006e2c4ab401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Duje=20Mihanovi=C4=87?= Date: Sat, 9 Apr 2022 14:07:49 +0200 Subject: [PATCH 10/17] sys-auth/pam-gnupg: minor fixups MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks to thesamesam for reporting these. Signed-off-by: Duje Mihanović --- sys-auth/pam-gnupg/Manifest | 2 +- sys-auth/pam-gnupg/pam-gnupg-0.3.ebuild | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sys-auth/pam-gnupg/Manifest b/sys-auth/pam-gnupg/Manifest index cb4d9fd284..cce556ddda 100644 --- a/sys-auth/pam-gnupg/Manifest +++ b/sys-auth/pam-gnupg/Manifest @@ -1 +1 @@ -DIST v0.3.tar.gz 20827 BLAKE2B 3973ffceec48105c28f368c14c879f9c1cae1676a5f5134c49249b3db8877418c2e9ac7937a6cacb3c5c2089be9a6e03c96e1988ecb029756c2f404674b9126c SHA512 5ee9af0f2e0d32680d6bc5e5b55ce46b86f01ff47b364a34484a6522035c96b8556c65d3d834ff711fb158ec4f1edbd48a1fea883641dedcbebd40074dc2fc5f +DIST pam-gnupg-0.3.tar.gz 20827 BLAKE2B 3973ffceec48105c28f368c14c879f9c1cae1676a5f5134c49249b3db8877418c2e9ac7937a6cacb3c5c2089be9a6e03c96e1988ecb029756c2f404674b9126c SHA512 5ee9af0f2e0d32680d6bc5e5b55ce46b86f01ff47b364a34484a6522035c96b8556c65d3d834ff711fb158ec4f1edbd48a1fea883641dedcbebd40074dc2fc5f diff --git a/sys-auth/pam-gnupg/pam-gnupg-0.3.ebuild b/sys-auth/pam-gnupg/pam-gnupg-0.3.ebuild index 2d892a1c10..315cddbb45 100644 --- a/sys-auth/pam-gnupg/pam-gnupg-0.3.ebuild +++ b/sys-auth/pam-gnupg/pam-gnupg-0.3.ebuild @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="Unlock GnuPG keys on login" HOMEPAGE="https://github.com/cruegge/pam-gnupg" -SRC_URI="https://github.com/cruegge/pam-gnupg/archive/refs/tags/v${PV}.tar.gz" +SRC_URI="https://github.com/cruegge/pam-gnupg/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64" @@ -16,9 +16,13 @@ RDEPEND=" >=app-crypt/gnupg-2.2.33-r1 " -src_configure() { +src_prepare() { + default eautoreconf - ./configure \ +} + +src_configure() { + econf \ --host=${CHOST} \ --prefix=/usr \ --infodir=/usr/share/info \ From 27a7384c4c9299ee4854d9da2bacab66b8343953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Duje=20Mihanovi=C4=87?= Date: Sat, 9 Apr 2022 14:19:52 +0200 Subject: [PATCH 11/17] games-fps/assaultcube: replace eapply{,user} with default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Again, thanks to thesamesam for reporting this. Signed-off-by: Duje Mihanović --- games-fps/assaultcube/assaultcube-1.3.0.2.ebuild | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild index d66c888b2c..ef8e8f81f1 100644 --- a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild +++ b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild @@ -22,14 +22,13 @@ RDEPEND="sys-libs/zlib DEPEND="${RDEPEND}" BDEPEND="sys-devel/clang" PATCHES=( - "${FILESDIR}/assaultcube-1.3.0.2-respect-ldflags.patch - ${FILESDIR}/assaultcube-1.3.0.2-fix-checkinstall.patch" # a script which checks for required libs and certain parts of the game + "${FILESDIR}/assaultcube-1.3.0.2-respect-ldflags.patch" + "${FILESDIR}/assaultcube-1.3.0.2-fix-checkinstall.patch" # a script which checks for required libs and certain parts of the game ) IUSE="debug" src_prepare() { - eapply ${PATCHES} - eapply_user + default sed -i 's|//#define PRODUCTION|#define PRODUCTION|' "${S}/source/src/cube.h" } From 46653ee4da7de42fef7a17a7f469899e205a5f84 Mon Sep 17 00:00:00 2001 From: Adrian Schollmeyer Date: Sat, 9 Apr 2022 15:14:38 +0200 Subject: [PATCH 12/17] net-im/abaddon: add 0.1.5, drop 0.1.4 Signed-off-by: Adrian Schollmeyer --- net-im/abaddon/Manifest | 2 +- net-im/abaddon/{abaddon-0.1.4.ebuild => abaddon-0.1.5.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename net-im/abaddon/{abaddon-0.1.4.ebuild => abaddon-0.1.5.ebuild} (100%) diff --git a/net-im/abaddon/Manifest b/net-im/abaddon/Manifest index daae35b6e9..79a9753329 100644 --- a/net-im/abaddon/Manifest +++ b/net-im/abaddon/Manifest @@ -1 +1 @@ -DIST abaddon-0.1.4.tar.gz 12814985 BLAKE2B 5a6f7cd2a0b5419717073d4ab4ef15a1826e269ec180d8eb6b2f702db98122758b69ee5976f4e7d05da4edd2696360912d209901f23470d3f2644510821506f5 SHA512 7d472d8264a161fc04cae4f48e83f13b2780092c1d675687d4197e87f8279bc48b81d1d77c21021ce05b4187abacf787f37215a67dcc8c3973ee82b7568b5a95 +DIST abaddon-0.1.5.tar.gz 12814169 BLAKE2B 3c16bcd5d2330d2fd5aeed3174b32c7001ff2217e2846a9bdb48e3c69412f990a66723a9401d095bf2c9ab8e924b360537c9a6b6cccf889d52cfac42973ad567 SHA512 88ba4c11f2ed9dd9f5cfcc055f9192d43076e566f9e069764272dc0e7149b331af5df2f7c9dacbe826b7999193997f25da93bcbe5c087e566e089c4798459154 diff --git a/net-im/abaddon/abaddon-0.1.4.ebuild b/net-im/abaddon/abaddon-0.1.5.ebuild similarity index 100% rename from net-im/abaddon/abaddon-0.1.4.ebuild rename to net-im/abaddon/abaddon-0.1.5.ebuild From 875966d6488af73397fb7e7765b9501babf77b56 Mon Sep 17 00:00:00 2001 From: Emil Jacobs Date: Sat, 9 Apr 2022 16:42:24 +0200 Subject: [PATCH 13/17] net-p2p/bisq: update Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Emil Jacobs --- net-p2p/bisq/Manifest | 2 +- net-p2p/bisq/{bisq-1.8.2.ebuild => bisq-1.8.4.ebuild} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename net-p2p/bisq/{bisq-1.8.2.ebuild => bisq-1.8.4.ebuild} (100%) diff --git a/net-p2p/bisq/Manifest b/net-p2p/bisq/Manifest index cb075dcc76..d3dbe589b6 100644 --- a/net-p2p/bisq/Manifest +++ b/net-p2p/bisq/Manifest @@ -1 +1 @@ -DIST Bisq-64bit-1.8.2.deb 189631156 BLAKE2B 41e0fe1e5d6e2990c207d452499b4fc19c6301ba32dd6304600acde30b9cbe8783fa491383c8f27edbb9cda7958ea796f1d619b442a686571539e88b2f318c2c SHA512 ea6565241d1f2f4cb2fb6021c996a90d7d4c099d0eda09691736877e3c2bdbe37b65ef8e8c48dabbc0008fc1b0132e3816e337007d597e22433c2bf6a5c35e12 +DIST Bisq-64bit-1.8.4.deb 194549460 BLAKE2B aabd1af6d36cf0d2128bd4180ad78a28899863c72172bd9b4244d3fd0b1ed6c5bd7521b5073dc86be7bda571d282fbcf1f28fff105687ede219de204158cebb8 SHA512 2666b2fc519c89420e5f319a9a5911d4325de9bc70600feb547514b36685c8035326d937bd120cd9b9833990630ed52bab438e536d358edfad0420990ba1beda diff --git a/net-p2p/bisq/bisq-1.8.2.ebuild b/net-p2p/bisq/bisq-1.8.4.ebuild similarity index 100% rename from net-p2p/bisq/bisq-1.8.2.ebuild rename to net-p2p/bisq/bisq-1.8.4.ebuild From f4a307ec23bea7fd206b1bf51b801bdd1b75843b Mon Sep 17 00:00:00 2001 From: BratishkaErik Date: Sun, 10 Apr 2022 14:24:51 +0600 Subject: [PATCH 14/17] net-p2p/yggdrasil-go, net-p2p/popura: update SRC_URI Recently I experienced power loss, [ I don't want to block this ebuilds Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: BratishkaErik --- net-p2p/popura/popura-0.4.3.ebuild | 2 +- net-p2p/yggdrasil-go/yggdrasil-go-0.4.3.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net-p2p/popura/popura-0.4.3.ebuild b/net-p2p/popura/popura-0.4.3.ebuild index 26435abcda..9f7544f950 100644 --- a/net-p2p/popura/popura-0.4.3.ebuild +++ b/net-p2p/popura/popura-0.4.3.ebuild @@ -12,7 +12,7 @@ DOCS=( README.md ) KEYWORDS="~amd64" SRC_URI=" https://github.com/popura-network/Popura/archive/v${PV}+popura1.tar.gz -> ${P}+popura1.tar.gz - https://gitea.minecast.xyz/BratishkaErik/distfiles/media/branch/master/${P}+popura1-deps.tar.bz2 + https://github.com/BratishkaErik/distfiles/raw/master/${P}+popura1-deps.tar.bz2 " S="${WORKDIR}/Popura-${PV}-popura1" diff --git a/net-p2p/yggdrasil-go/yggdrasil-go-0.4.3.ebuild b/net-p2p/yggdrasil-go/yggdrasil-go-0.4.3.ebuild index e6c2f03ed6..d6237019d6 100644 --- a/net-p2p/yggdrasil-go/yggdrasil-go-0.4.3.ebuild +++ b/net-p2p/yggdrasil-go/yggdrasil-go-0.4.3.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="An experiment in scalable routing as an encrypted IPv6 overlay netw HOMEPAGE="https://yggdrasil-network.github.io/" SRC_URI=" https://github.com/yggdrasil-network/yggdrasil-go/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://gitea.minecast.xyz/BratishkaErik/distfiles/media/branch/master/${P}-deps.tar.bz2 + https://github.com/BratishkaErik/distfiles/raw/master/${P}-deps.tar.bz2 " LICENSE="LGPL-3 MIT Apache-2.0 BSD ZLIB" From 42f09435eb4906a1ca35d1ab71d918836b21c3a5 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Sun, 10 Apr 2022 10:56:04 +0200 Subject: [PATCH 15/17] media-gfx/superslicer: add 2.3.57.12 ebuild Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Yahor Berdnikau --- media-gfx/superslicer/Manifest | 2 + .../files/cereal-new-versions-2.3.57.12.patch | 46 ++++++++ .../files/miniz-zip-header-2.3.57.12.patch | 19 +++ .../files/missing-imports-2.3.57.12.patch | 10 ++ .../files/symlink-fix-2.3.57.12.patch | 9 ++ .../files/version-suffix-2.3.57.12.patch | 42 +++++++ .../superslicer/superslicer-2.3.57.12.ebuild | 109 ++++++++++++++++++ 7 files changed, 237 insertions(+) create mode 100644 media-gfx/superslicer/files/cereal-new-versions-2.3.57.12.patch create mode 100644 media-gfx/superslicer/files/miniz-zip-header-2.3.57.12.patch create mode 100644 media-gfx/superslicer/files/missing-imports-2.3.57.12.patch create mode 100644 media-gfx/superslicer/files/symlink-fix-2.3.57.12.patch create mode 100644 media-gfx/superslicer/files/version-suffix-2.3.57.12.patch create mode 100644 media-gfx/superslicer/superslicer-2.3.57.12.ebuild diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest index 0a6304018e..d09c41d47a 100644 --- a/media-gfx/superslicer/Manifest +++ b/media-gfx/superslicer/Manifest @@ -3,6 +3,8 @@ DIST superslicer-2.3.57.10-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe604 DIST superslicer-2.3.57.10.tar.gz 32466957 BLAKE2B 7c5fff6ba8139a9bf66d931e6e48e6a9201e7911e90ce2e822ded7ae713f0b8fdf86b9cd317ded4802146c24758148ec989c213b5992c323a2fd442e17a4e228 SHA512 4d20078e11f5f99993220409bee54ca0a3f2a6fff04febfc09b5f1bc445ceaabc3a359f8f7f478127aa1504e8ba8a121a682c991adf2c45cb2ff1598ed2e3445 DIST superslicer-2.3.57.11-profiles.zip 14382021 BLAKE2B f1908f3bdaebd742dcfa9d2a84dd94502b76261bccd5f924254d3ba10efa32f19923b3861f09c9e346092b77aeb7057830b0428462660967379d74b566744fd0 SHA512 af7c3843bfc1e7962b386ab1c6a20007e692abdb4d70e3129edf00739a082fe92193ab72e7746575b52aff4fd684c9c17b7f7698d7831aad8017310293895371 DIST superslicer-2.3.57.11.tar.gz 32469197 BLAKE2B 8406717396acfa0c2cfe381587693d3961bdb4933f0d0821ed814e89f7597b4d90a56e877e3dd7e45fe4b14ee13f143e1cff241d59ce1798c39631dd7ffa706f SHA512 978eb5004d788e93ea58b788fbf8fe7a7c1c515b0a138e20662c3c1973b5c72373cd14c76d25ee180095c030416b5b4429b61bb73432910fe9288897a5d7cb4d +DIST superslicer-2.3.57.12-profiles.zip 14382021 BLAKE2B f1908f3bdaebd742dcfa9d2a84dd94502b76261bccd5f924254d3ba10efa32f19923b3861f09c9e346092b77aeb7057830b0428462660967379d74b566744fd0 SHA512 af7c3843bfc1e7962b386ab1c6a20007e692abdb4d70e3129edf00739a082fe92193ab72e7746575b52aff4fd684c9c17b7f7698d7831aad8017310293895371 +DIST superslicer-2.3.57.12.tar.gz 32472874 BLAKE2B 600ed29724476f2812c7bbea9bc26d1b54f2291d8994b883ad9da64899ad181ca19e3975865f190b1a3125341456fb38f982f5c20a5d4a0c36459de498a6588b SHA512 3830d275ef9dc5a4b1c62451e532012995647ba276a65007ae2160a89f2c044e18bad851dcf225f768a7023d00e92f398013ffdf1e1fd75e137f37e93edc8f59 DIST superslicer-2.3.57.7-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe60495f95266ec0b07824c803eaca7a29853a3465ab3d631d794899aebb9ef5f7660cb9341c70e9c38d6f8247a58655ed720deebbc584 SHA512 6beab170ae7e50e9880288673fd482f2903d5e9b87a0ddd6549098fa35f9b87e4891f015d0a26aedfac9736c3f55dcd1794d8abb3f9cc072bcdbb7e87f42a9fa DIST superslicer-2.3.57.7.tar.gz 32400355 BLAKE2B bcacf218ad18146327a9f7005d2c2217cf859d2793e8f74bfd453e2b8b12bf83d224f0325f6908b806735fb94c476b87c5dfe35c16026006bf5bd38de26e5f36 SHA512 d9a92366ed426dab77a5d49cddd7c7f37f2a0e026574bcbff342e579c555aefb19aaea8de7b5180bb87ab2749ba0cef96e870d808914fdbc58f3ddf04e1a4a65 DIST superslicer-2.3.57.9-profiles.zip 12193950 BLAKE2B c61be0190345bf886cbe60495f95266ec0b07824c803eaca7a29853a3465ab3d631d794899aebb9ef5f7660cb9341c70e9c38d6f8247a58655ed720deebbc584 SHA512 6beab170ae7e50e9880288673fd482f2903d5e9b87a0ddd6549098fa35f9b87e4891f015d0a26aedfac9736c3f55dcd1794d8abb3f9cc072bcdbb7e87f42a9fa diff --git a/media-gfx/superslicer/files/cereal-new-versions-2.3.57.12.patch b/media-gfx/superslicer/files/cereal-new-versions-2.3.57.12.patch new file mode 100644 index 0000000000..7e3b5dfc38 --- /dev/null +++ b/media-gfx/superslicer/files/cereal-new-versions-2.3.57.12.patch @@ -0,0 +1,46 @@ +# Backported via https://bugs.gentoo.org/834005 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -436,6 +436,9 @@ endif () + + # Find the Cereal serialization library + find_package(cereal REQUIRED) ++if (NOT TARGET cereal::cereal) ++ add_library(cereal::cereal ALIAS cereal) ++endif () + + # l10n + set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization") +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -123,7 +123,7 @@ + set_target_properties(Slic3r PROPERTIES OUTPUT_NAME "${SLIC3R_APP_CMD}") + endif () + +-target_link_libraries(Slic3r libslic3r cereal) ++target_link_libraries(Slic3r libslic3r cereal::cereal) + if (APPLE) + # add_compile_options(-stdlib=libc++) + # add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE) +--- a/src/libslic3r/CMakeLists.txt ++++ b/src/libslic3r/CMakeLists.txt +@@ -321,7 +321,7 @@ + target_link_libraries(libslic3r + libnest2d + admesh +- cereal ++ cereal::cereal + libigl + miniz + boost_libs +--- a/src/slic3r/CMakeLists.txt ++++ b/src/slic3r/CMakeLists.txt +@@ -259,6 +259,6 @@ + + encoding_check(libslic3r_gui) + +-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi exif libcurl ${wxWidgets_LIBRARIES}) ++target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi exif libcurl ${wxWidgets_LIBRARIES}) + + if (CMAKE_SYSTEM_NAME STREQUAL "Linux") + target_link_libraries(libslic3r_gui ${DBUS_LIBRARIES}) diff --git a/media-gfx/superslicer/files/miniz-zip-header-2.3.57.12.patch b/media-gfx/superslicer/files/miniz-zip-header-2.3.57.12.patch new file mode 100644 index 0000000000..a00aefb9c2 --- /dev/null +++ b/media-gfx/superslicer/files/miniz-zip-header-2.3.57.12.patch @@ -0,0 +1,19 @@ +--- a/src/libslic3r/Format/3mf.cpp ++++ b/src/libslic3r/Format/3mf.cpp +@@ -31,6 +31,7 @@ namespace pt = boost::property_tree; + #include + #include + #include "miniz_extension.hpp" ++#include + + // VERSION NUMBERS + // 0 : .3mf, files saved by older slic3r or other applications. No version definition in them. +--- a/src/libslic3r/miniz_extension.hpp ++++ b/src/libslic3r/miniz_extension.hpp +@@ -3,6 +3,7 @@ + + #include + #include ++#include + + namespace Slic3r { diff --git a/media-gfx/superslicer/files/missing-imports-2.3.57.12.patch b/media-gfx/superslicer/files/missing-imports-2.3.57.12.patch new file mode 100644 index 0000000000..009a4892aa --- /dev/null +++ b/media-gfx/superslicer/files/missing-imports-2.3.57.12.patch @@ -0,0 +1,10 @@ +--- a/src/slic3r/Utils/PresetUpdater.cpp ++++ b/src/slic3r/Utils/PresetUpdater.cpp +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/media-gfx/superslicer/files/symlink-fix-2.3.57.12.patch b/media-gfx/superslicer/files/symlink-fix-2.3.57.12.patch new file mode 100644 index 0000000000..80d9eddfa5 --- /dev/null +++ b/media-gfx/superslicer/files/symlink-fix-2.3.57.12.patch @@ -0,0 +1,9 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -273,5 +273,5 @@ else () + install(TARGETS Slic3r RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") + + # Install the symlink for gcodeviewer +- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink slic3r ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})") ++ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${SLIC3R_APP_CMD} ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})") + endif () diff --git a/media-gfx/superslicer/files/version-suffix-2.3.57.12.patch b/media-gfx/superslicer/files/version-suffix-2.3.57.12.patch new file mode 100644 index 0000000000..ed583fcf9b --- /dev/null +++ b/media-gfx/superslicer/files/version-suffix-2.3.57.12.patch @@ -0,0 +1,42 @@ +--- a/src/platform/unix/Gcodeviewer.desktop.in ++++ b/src/platform/unix/Gcodeviewer.desktop.in +@@ -1,5 +1,5 @@ + [Desktop Entry] +-Name=@GCODEVIEWER_APP_NAME@ ++Name=@GCODEVIEWER_APP_KEY@ + Comment=G-code viewer of Slic3r + Exec=@SLIC3R_APP_CMD@ --gcodeviewer %F + Icon=@GCODEVIEWER_APP_KEY@ +--- a/src/platform/unix/Slic3r.desktop.in ++++ b/src/platform/unix/Slic3r.desktop.in +@@ -1,5 +1,5 @@ + [Desktop Entry] +-Name=@SLIC3R_APP_NAME@ ++Name=@SLIC3R_APP_KEY@ + GenericName=3D Printing Software + Comment=G-code generator for 3D printers + Icon=@SLIC3R_APP_KEY@ +@@ -10,4 +10,4 @@ MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj; + Categories=Graphics;3DGraphics;Engineering; + Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA + StartupNotify=false +-StartupWMClass=@SLIC3R_APP_KEY@ ++StartupWMClass=@SLIC3R_APP_NAME@ +--- a/version.inc ++++ b/version.inc +@@ -4,12 +4,12 @@ + # name of the slicer + set(SLIC3R_APP_NAME "SuperSlicer") + # Key fo the slicer, must only contains ascii chars and no spaces (be valid in all filesystems) +-set(SLIC3R_APP_KEY "SuperSlicer") ++set(SLIC3R_APP_KEY "SuperSlicer2.3") + # exe name of the slicer, should be lowercase and valid in all os +-set(SLIC3R_APP_CMD "superslicer") ++set(SLIC3R_APP_CMD "superslicer-2.3") + # versions + set(SLIC3R_VERSION "2.3.57") + set(SLIC3R_VERSION_FULL "2.3.57.12") +-set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+UNKNOWN") ++set(SLIC3R_BUILD_ID "${SLIC3R_APP_KEY}_${SLIC3R_VERSION_FULL}+Gentoo") + set(SLIC3R_RC_VERSION "2,3,57,12") + set(SLIC3R_RC_VERSION_DOTS "${SLIC3R_VERSION_FULL}") diff --git a/media-gfx/superslicer/superslicer-2.3.57.12.ebuild b/media-gfx/superslicer/superslicer-2.3.57.12.ebuild new file mode 100644 index 0000000000..de043d7ded --- /dev/null +++ b/media-gfx/superslicer/superslicer-2.3.57.12.ebuild @@ -0,0 +1,109 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.0-gtk3" + +inherit xdg cmake desktop wxwidgets + +MY_PN="SuperSlicer" +DESCRIPTION="A mesh slicer to generated G-Code for fused-filament fabrication" +HOMEPAGE="https://github.com/supermerill/SuperSlicer" +SRC_URI="https://github.com/supermerill/SuperSlicer/archive/${PV}.tar.gz -> ${P}.tar.gz + profiles? ( https://github.com/slic3r/slic3r-profiles/archive/0b8261ae8bbd7c31d736f371323476d6aff3ef3b.zip -> ${P}-profiles.zip )" +S="${WORKDIR}/${MY_PN}-${PV}" + +LICENSE="AGPL-3" +SLOT="23" +KEYWORDS="~amd64" +IUSE="gui test profiles" + +# tests fail to link with USE=-gui, bug #760096 +REQUIRED_USE="test? ( gui )" +RESTRICT="!test? ( test )" + +BDEPEND="profiles? ( app-arch/unzip )" +RDEPEND=" + dev-cpp/eigen:3 + dev-cpp/tbb + >=dev-libs/boost-1.73.0:=[nls,threads(+)] + dev-libs/cereal + dev-libs/expat + dev-libs/c-blosc + dev-libs/gmp:= + >=dev-libs/miniz-2.1.0-r2 + dev-libs/mpfr:= + >=media-gfx/openvdb-5.0.0 + media-libs/ilmbase:= + media-libs/libpng:0= + media-libs/openexr:0= + media-libs/qhull:= + sci-libs/libigl + sci-libs/nlopt + >=sci-mathematics/cgal-5.0:= + sys-apps/dbus + sys-libs/zlib:= + gui? ( + dev-libs/glib:2 + media-libs/glew:0= + net-misc/curl + virtual/glu + virtual/opengl + x11-libs/gtk+:3 + >=x11-libs/wxGTK-3.0.5.1:=[X,opengl] + ) +" +DEPEND="${RDEPEND} + media-libs/qhull[static-libs] + test? ( dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}/miniz-zip-header-${PV}.patch" + "${FILESDIR}/freecad-dialog-2.2.53.4.patch" + "${FILESDIR}/missing-imports-${PV}.patch" + "${FILESDIR}/cereal-new-versions-${PV}.patch" + "${FILESDIR}/version-suffix-${PV}.patch" + "${FILESDIR}/symlink-fix-${PV}.patch" +) + +src_unpack() { + unpack ${P}.tar.gz + mv "${S}/resources/icons/SuperSlicer_192px.png" "${S}/resources/icons/SuperSlicer2.3_192px.png" || die "Failed to rename icons" + mv "${S}/resources/icons/SuperSlicer_192px_transparent.png" "${S}/resources/icons/SuperSlicer2.3_192px_transparent.png" || die "Failed to rename icons" + mv "${S}/resources/icons/SuperSlicer_128px.png" "${S}/resources/icons/SuperSlicer2.3_128px.png" || die "Failed to rename icons" + mv "${S}/resources/icons/SuperSlicer-gcodeviewer_128px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_128px.png" || die "Failed to rename icons" + mv "${S}/resources/icons/SuperSlicer-gcodeviewer_192px.png" "${S}/resources/icons/SuperSlicer2.3-gcodeviewer_192px.png" || die "Failed to rename icons" + cp "${S}/resources/icons/SuperSlicer.png" "${S}/resources/icons/SuperSlicer2.3_logo.png" || die "Failed to make logo icon" + + use profiles && unpack ${P}-profiles.zip + if use profiles ; then + cp -r "${WORKDIR}/slic3r-profiles-0b8261ae8bbd7c31d736f371323476d6aff3ef3b/"* "${S}/resources/profiles" || die "Failed to copy profiles" + fi +} + +src_configure() { + use gui && setup-wxwidgets + + CMAKE_BUILD_TYPE=Release + local mycmakeargs=( + -DSLIC3R_BUILD_TESTS=$(usex test) + -DSLIC3R_FHS=ON + -DSLIC3R_GTK=3 + -DSLIC3R_GUI=$(usex gui) + -DSLIC3R_PCH=OFF + -DSLIC3R_WX_STABLE=ON + -Wno-dev + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use gui; then + newicon -s 128 resources/icons/SuperSlicer2.3_128px.png SuperSlicer2.3.png + fi +} From 2ef527588352d9e95b72da03cfc5cd4ec5922fd0 Mon Sep 17 00:00:00 2001 From: Dex Conner Date: Sun, 10 Apr 2022 12:04:08 +0300 Subject: [PATCH 16/17] gui-apps/somebar: initial import Signed-off-by: Dex Conner --- gui-apps/somebar/metadata.xml | 8 ++++++ gui-apps/somebar/somebar-9999.ebuild | 38 ++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 gui-apps/somebar/metadata.xml create mode 100644 gui-apps/somebar/somebar-9999.ebuild diff --git a/gui-apps/somebar/metadata.xml b/gui-apps/somebar/metadata.xml new file mode 100644 index 0000000000..2ad19f02c3 --- /dev/null +++ b/gui-apps/somebar/metadata.xml @@ -0,0 +1,8 @@ + + + + + cantcuckthis@danwin1210.de + Dex Conner + + diff --git a/gui-apps/somebar/somebar-9999.ebuild b/gui-apps/somebar/somebar-9999.ebuild new file mode 100644 index 0000000000..1ec94a368e --- /dev/null +++ b/gui-apps/somebar/somebar-9999.ebuild @@ -0,0 +1,38 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit savedconfig git-r3 meson + +DESCRIPTION="dwm-like bar for dwl" +HOMEPAGE="https://git.sr.ht/~raphi/somebar" +EGIT_REPO_URI="https://git.sr.ht/~raphi/somebar" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="" + +DEPEND=" + dev-libs/wayland + x11-libs/cairo + x11-libs/pango +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-libs/wayland-protocols + dev-util/wayland-scanner + dev-util/meson + dev-util/ninja +" + +src_prepare() { + default + use savedconfig && restore_config src/config.hpp + [ -f src/config.hpp ] || cp src/config.def.hpp src/config.hpp +} + +src_install() { + meson_install + save_config src/config.hpp +} From b68b3c8ad2055f234164d17dcb846ef39d76387c Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sun, 10 Apr 2022 14:33:20 +0200 Subject: [PATCH 17/17] games-action/polymc: synchronize from PR https://github.com/gentoo/gentoo/pull/24966 Signed-off-by: Andrew Ammerlaan --- games-action/polymc/Manifest | 2 +- games-action/polymc/polymc-1.1.1.ebuild | 81 +++++++++++++---------- games-action/polymc/polymc-9999.ebuild | 87 +++++++++++++++---------- 3 files changed, 102 insertions(+), 68 deletions(-) diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest index bb6f6641a8..b44203e704 100644 --- a/games-action/polymc/Manifest +++ b/games-action/polymc/Manifest @@ -1 +1 @@ -DIST PolyMC-1.1.1.tar.gz 5116164 BLAKE2B ca251cac3c8ea21de8a59297a0e637dac078d751476fec5fe86696df270c63ff079779056f016fa656506ea205bb7ace50ab6e0df190ffca14e43297b92292af SHA512 db32479e9e8a92ec61292c97281673b3084e1085d29b764214834de872d9eddf2ed1d2e383bcd79197e0c9321eec025af652b12c863596ff6abb0f5fba9a7af5 +DIST polymc-1.1.1.tar.gz 5116164 BLAKE2B ca251cac3c8ea21de8a59297a0e637dac078d751476fec5fe86696df270c63ff079779056f016fa656506ea205bb7ace50ab6e0df190ffca14e43297b92292af SHA512 db32479e9e8a92ec61292c97281673b3084e1085d29b764214834de872d9eddf2ed1d2e383bcd79197e0c9321eec025af652b12c863596ff6abb0f5fba9a7af5 diff --git a/games-action/polymc/polymc-1.1.1.ebuild b/games-action/polymc/polymc-1.1.1.ebuild index d93038a616..bc6b3a0981 100644 --- a/games-action/polymc/polymc-1.1.1.ebuild +++ b/games-action/polymc/polymc-1.1.1.ebuild @@ -8,56 +8,71 @@ inherit cmake java-pkg-2 optfeature xdg HOMEPAGE="https://polymc.org/" DESCRIPTION="A custom, open source Minecraft launcher" -MY_PN="PolyMC" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 -# Let's use the vendored tarball to avoid dealing with the submodules directly -SRC_URI=" - https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -" + EGIT_REPO_URI=" + https://github.com/PolyMC/PolyMC + https://github.com/MultiMC/libnbtplusplus + https://github.com/stachenov/quazip + " + # Include all submodules + EGIT_SUBMODULES=( '*' ) +else + MY_PN="PolyMC" + + # Let's use the vendored tarball to avoid dealing with the submodules directly + SRC_URI=" + https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz + " + + # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV} + S="${WORKDIR}/${MY_PN}-${PV}" + + KEYWORDS="~amd64" +fi + +# Apache-2.0 for MultiMC (PolyMC is forked from it) # GPL-3 for PolyMC # LGPL-3 for libnbtplusplus # LGPL-2.1 with linking exception for Quazip -LICENSE="GPL-3 LGPL-3 LGPL-2.1-with-linking-exception" +# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries +LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 LGPL-2.1-with-linking-exception OFL-1.1 MIT" SLOT="0" -KEYWORDS="amd64" IUSE="debug" -QT_DEPS=" - >=dev-qt/qtcore-5.6.0:5 - >=dev-qt/qttest-5.6.0:5 - >=dev-qt/qtconcurrent-5.6.0:5 - >=dev-qt/qtgui-5.6.0:5 - >=dev-qt/qtnetwork-5.6.0:5 - >=dev-qt/qtwidgets-5.6.0:5 - >=dev-qt/qtxml-5.6.0:5 -" +MIN_QT="5.6.0" -BDEPEND=" - ${QT_DEPS} - sys-libs/zlib - >=virtual/jdk-1.8.0:* - media-libs/libglvnd +QT_DEPS=" + >=dev-qt/qtcore-${MIN_QT}:5 + >=dev-qt/qttest-${MIN_QT}:5 + >=dev-qt/qtconcurrent-${MIN_QT}:5 + >=dev-qt/qtgui-${MIN_QT}:5 + >=dev-qt/qtnetwork-${MIN_QT}:5 + >=dev-qt/qtwidgets-${MIN_QT}:5 + >=dev-qt/qtxml-${MIN_QT}:5 " DEPEND=" ${QT_DEPS} - >=virtual/jre-1.8.0:* - virtual/opengl + >=virtual/jdk-1.8.0:* + media-libs/libglvnd + sys-libs/zlib " -RDEPEND="${DEPEND}" +# At run-time we don't depend on JDK, only JRE +# And we need more than just the GL headers +RDEPEND=" + ${QT_DEPS} + >=virtual/jre-1.8.0:* + virtual/opengl + sys-libs/zlib +" -# We'll fetch the files from the GitHub archive directly, at least for now... -RESTRICT="mirror" - -# The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV} -S="${WORKDIR}/${MY_PN}-${PV}" - -src_prepare(){ - default +src_prepare() { cmake_src_prepare } @@ -72,7 +87,7 @@ src_configure(){ local mycmakeargs=( # Do a system install - -DLauncher_PORTABLE=false + -DLauncher_PORTABLE=0 -DCMAKE_INSTALL_PREFIX="/usr" # Resulting binary is named polymc -DLauncher_APP_BINARY_NAME="${PN}" diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild index ae09f674bd..bc6b3a0981 100644 --- a/games-action/polymc/polymc-9999.ebuild +++ b/games-action/polymc/polymc-9999.ebuild @@ -3,62 +3,76 @@ EAPI=8 -inherit cmake git-r3 java-pkg-2 optfeature xdg +inherit cmake java-pkg-2 optfeature xdg HOMEPAGE="https://polymc.org/" DESCRIPTION="A custom, open source Minecraft launcher" -EGIT_REPO_URI=" - https://github.com/PolyMC/PolyMC - https://github.com/MultiMC/libnbtplusplus - https://github.com/stachenov/quazip -" +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI=" + https://github.com/PolyMC/PolyMC + https://github.com/MultiMC/libnbtplusplus + https://github.com/stachenov/quazip + " + + # Include all submodules + EGIT_SUBMODULES=( '*' ) +else + MY_PN="PolyMC" + + # Let's use the vendored tarball to avoid dealing with the submodules directly + SRC_URI=" + https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz + " + + # The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV} + S="${WORKDIR}/${MY_PN}-${PV}" + + KEYWORDS="~amd64" +fi + +# Apache-2.0 for MultiMC (PolyMC is forked from it) # GPL-3 for PolyMC # LGPL-3 for libnbtplusplus # LGPL-2.1 with linking exception for Quazip -LICENSE="GPL-3 LGPL-3 LGPL-2.1-with-linking-exception" +# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries +LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 LGPL-2.1-with-linking-exception OFL-1.1 MIT" SLOT="0" IUSE="debug" -QT_DEPS=" - >=dev-qt/qtcore-5.6.0:5 - >=dev-qt/qttest-5.6.0:5 - >=dev-qt/qtconcurrent-5.6.0:5 - >=dev-qt/qtgui-5.6.0:5 - >=dev-qt/qtnetwork-5.6.0:5 - >=dev-qt/qtwidgets-5.6.0:5 - >=dev-qt/qtxml-5.6.0:5 -" +MIN_QT="5.6.0" -BDEPEND=" - ${QT_DEPS} - sys-libs/zlib - >=virtual/jdk-1.8.0:* - media-libs/libglvnd +QT_DEPS=" + >=dev-qt/qtcore-${MIN_QT}:5 + >=dev-qt/qttest-${MIN_QT}:5 + >=dev-qt/qtconcurrent-${MIN_QT}:5 + >=dev-qt/qtgui-${MIN_QT}:5 + >=dev-qt/qtnetwork-${MIN_QT}:5 + >=dev-qt/qtwidgets-${MIN_QT}:5 + >=dev-qt/qtxml-${MIN_QT}:5 " DEPEND=" ${QT_DEPS} - >=virtual/jre-1.8.0:* - virtual/opengl + >=virtual/jdk-1.8.0:* + media-libs/libglvnd + sys-libs/zlib " -RDEPEND="${DEPEND}" +# At run-time we don't depend on JDK, only JRE +# And we need more than just the GL headers +RDEPEND=" + ${QT_DEPS} + >=virtual/jre-1.8.0:* + virtual/opengl + sys-libs/zlib +" src_prepare() { - if ${PV} != 9999; then - EGIT_COMMIT="${PV}" - fi - - git submodule init - git config submodule.libnbtplusplus.url "${WORKDIR}/libnbtplusplus" - git config submodule.quazip.url "${WORKDIR}/quazip" - git submodule update - - default cmake_src_prepare } @@ -66,14 +80,19 @@ src_configure(){ if use debug; then CMAKE_BUILD_TYPE=Debug else + # Prepare for LTO in 1.2.0 (?) + # See https://github.com/PolyMC/PolyMC/pull/333 CMAKE_BUILD_TYPE=Release fi local mycmakeargs=( + # Do a system install -DLauncher_PORTABLE=0 -DCMAKE_INSTALL_PREFIX="/usr" + # Resulting binary is named polymc -DLauncher_APP_BINARY_NAME="${PN}" ) + cmake_src_configure }