diff --git a/dev-util/electron-bin/Manifest b/dev-util/electron-bin/Manifest index 431442842..fee630fc1 100644 --- a/dev-util/electron-bin/Manifest +++ b/dev-util/electron-bin/Manifest @@ -1,4 +1,4 @@ -DIST electron-bin-5.0.3-arm64.zip 65333398 BLAKE2B 7afe07f894f66afd5d968e85bc4c50af0f2ba7a449c71857c32cc184e932a81b979daaba13d41f39ddbb19096ec474a7563ebc570c02aae46acefb992bc1f80d SHA512 ef161d78732e44e0769fbb5fd0f12ff8eece9d34eea1068c32c5f579bbdebc25c71433128149b9c03bcc10d5b21421b3d8fa9e484aaf51f72a0f11baf792f345 -DIST electron-bin-5.0.3-armv7l.zip 55130470 BLAKE2B 9dc9df478bf722d10dfd10dc92a7831d432ad9fc6e7fe14b0dddcf1be42b2b00aa7fb119601f57d9d1a2183c8d4294bc817e1df09ba58c1bf9fd7c503f302679 SHA512 15fe2dccae32e0e5cd2925f824a4804111fee11e70efcf9100718d1efac29d268b1c64c68d886a3fc3a00ef33277f219ca0534d17e400a57e006be32a5387181 -DIST electron-bin-5.0.3-ia32.zip 67149862 BLAKE2B 0a76e4c53ea7c8f84413bd322e5d9208e8d9796d51d0cac8204cfc3fbfeb0e4e5570dda07fb44b786d6e9a86dc845d1e5e478daf1538e69faf1b7b4f1149437f SHA512 037ea7e904c256d6a11262775e7bf3e9d513c403bda3e6e42c10879d0fa52b916f4c8a29d166fc37ef5d7260ddcda1b38f1667d66f7a60644ee7174ca13e003b -DIST electron-bin-5.0.3-x64.zip 65754434 BLAKE2B b0d2bd27b078ad0c446db4478cce5061e53559c35d9621cfd004b6e243f11800be3ad97278e9cb12f3d3227d3029a71245ab2e89e88ff77c379011c0f98fa409 SHA512 c8af2650531d6bbe663f974f5a1515cfdbc59b58617c7f1d20a568d45a5a458c1898190b9a59768f1dccc3dd2a34fead8a56e65fd34a49df998912349ed3eca1 +DIST electron-bin-6.0.11-arm64.zip 62651275 BLAKE2B d848754f2181f87ed218333252c32e7af3ca782acb4fa6fdfd36d7043feffb301ba1f8cbdb654d8b613602e7d1d6a932c47381a0f3c735811017e7463e5912c0 SHA512 1f7ed8608db90f7d0eba36b8a4ab590d857ab1db0d469d625f3395a9a78b881dfa4877e7e2ced0a98e1eb56b9ac947d220d790393ee63152e50b8497f8446c33 +DIST electron-bin-6.0.11-armv7l.zip 54838319 BLAKE2B bfc0f69a510f329b96a34f11254604a2dad906ea57f8ff303e15f2b841fda9cb889ac6d3b0a4ec8e94a8eeced39d8010ec15117ede17bdb79c94b57de8793305 SHA512 6ea01bbcd929265459fa4cba4316335a971b84a3f2c177146eb850c93de1c61ec0ebb978ed9d200232469e6da3ac4119b94c16f0f200f4b74d8ecb090f144910 +DIST electron-bin-6.0.11-ia32.zip 63263712 BLAKE2B 50a90211e77b968534049b381da8b983ee100de507ce6db1bf086cb9831dc53c7e48d514e8a011abf6140686ef5bddc1ed685109f1a3540ac9e8f93a06e8a383 SHA512 9face6b7c41ff74c654a722a90ae183fe8399d30613e9e810780098894e12c1e3c292e8305bd67795c9be5cd6098ad21a21852835ccb20f88122c5351168fbef +DIST electron-bin-6.0.11-x64.zip 62382118 BLAKE2B fa384e268fcc2d6d97415852cbc6de9eecba43c3a4dc17fe801686535f555f16cdf0468e1b36bdd596defe24bc2a5c7e46252c1413026f4253f4ff99a69b30f1 SHA512 311ae0c8213931b69925ccc844fea0482860be549d124a1af2128e5044fa8dc4632e742ac57075f55d6f5dd24c1059dea3ed1d2c534d70341e3fae295ff1b4d4 diff --git a/dev-util/electron-bin/electron-bin-5.0.3.ebuild b/dev-util/electron-bin/electron-bin-6.0.11.ebuild similarity index 100% rename from dev-util/electron-bin/electron-bin-5.0.3.ebuild rename to dev-util/electron-bin/electron-bin-6.0.11.ebuild diff --git a/dev-util/electron-packager/Manifest b/dev-util/electron-packager/Manifest index a7d869587..ffc5378bb 100644 --- a/dev-util/electron-packager/Manifest +++ b/dev-util/electron-packager/Manifest @@ -1,4 +1,3 @@ -DIST electron-packager-13.0.1-npm-cache.tar.gz 3443398 BLAKE2B f7f960599cf275425ee60befe678c20ca00334149d4ec32513c6fcc200ccbc6bafdbf7bfd1e4c97099124f3fb26167f220e410a570ed66fd5558412fcc27c7cc SHA512 a1d8a0e4083944d3f41debe664df65e38b9dc99b7f5d1792dcf36b018751e261247051d96aaaad2c6f061e9f96dc6bab01923806001acada80bf1a19c24ae452 -DIST electron-packager-13.0.1.tar.gz 168324 BLAKE2B 53ee57ac3a15b620441d9a911d2058a8388c7507f4e08f2b5cf37cf4818c6ea0c7af29906626375f03083484c15fe6ce8bc26fab6d248b27abb2cce74baa2c5b SHA512 f160daafb57c5008bed470f0a54bcbf9b7c344e906e455663a73069ce0b0114226e63a7c3f6d24ea285f50ab39a911a17c4506e26296abd105e3d19cd426b351 DIST electron-packager-14.0.1-node_modules.tar.gz 13202470 BLAKE2B 9ded47952b259bb9c4b65bd724d89ff88248f85d11f011a192bc963eff49cf2576c69bd4e6eb39da41cbdeb1faba7e9f8c33fa72b6d98cc1ff17fea9e0b71451 SHA512 d2214087530dcd39153d2f67ea92d147941aa66f793062e77f77b62c9830b964af84b36b164ef9b8d38b1dc54b55c058cb775fc3eb80bf474f6109e92d613b31 DIST electron-packager-14.0.1.tar.gz 171452 BLAKE2B d1621663cfe38c80277399145f13b0138f6830a637640334f96ff211e9c8d498ec41fb9ef0e25a88bca255d6f668313ee0122f922bb24ab42faa819b498f21a6 SHA512 f1b4aca4df63560492acb078e8255856d3a26c17915b27c2cc573c1b13586a645d8e4ca97f438794e0e26d37d818bcf790ccb1494f576a897e65f33734057f09 +DIST electron-packager-14.2.1.tar.gz 174468 BLAKE2B 317753aa55d4859823ae8bcdfbf2b2af6da13e6fb1de827d09dd9eadb5c09ac246ed05a37c6a5590084fc3bce9c57f525776a3ed4758b58ac8fcac4f52cb25e9 SHA512 27fb24a394df9e5d9f1afafb101f73568d22e99f64129f9ae7f9641b8106d9562bcb2e0b9e5c03e703c3c53cfcb2064cfa0a1b6bf2b2b57300cd553bc38a8ce5 diff --git a/dev-util/electron-packager/electron-packager-13.0.1.ebuild b/dev-util/electron-packager/electron-packager-14.2.1.ebuild similarity index 59% rename from dev-util/electron-packager/electron-packager-13.0.1.ebuild rename to dev-util/electron-packager/electron-packager-14.2.1.ebuild index 430e5a538..454025657 100644 --- a/dev-util/electron-packager/electron-packager-13.0.1.ebuild +++ b/dev-util/electron-packager/electron-packager-14.2.1.ebuild @@ -6,7 +6,7 @@ EAPI=6 DESCRIPTION="Six Degrees of Domain Admin" HOMEPAGE="https://github.com/electron-userland/electron-packager" SRC_URI="https://github.com/electron-userland/electron-packager/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://dev.pentoo.ch/~blshkv/distfiles/electron-packager-13.0.1-npm-cache.tar.gz" + https://dev.pentoo.ch/~blshkv/distfiles/electron-packager-14.0.1-node_modules.tar.gz" LICENSE="" SLOT="0" @@ -16,13 +16,21 @@ IUSE="doc" DEPEND="net-libs/nodejs[npm]" RDEPEND="${DEPEND}" +src_prepare(){ + mv ${WORKDIR}/node_modules ${S} + eapply_user +} + src_compile(){ # For use in npm scripts (recommended) # npm install electron-packager --save-dev # For use from the CLI - npm install electron-packager -g --prefix "${EPREFIX}" \ - --cache="${WORKDIR}/${P}-npm-cache" +# npm install electron-packager -g --prefix "${EPREFIX}" \ +# --cache="${WORKDIR}/${P}-npm-cache" + + npm build +# -g --prefix "${EPREFIX}" # sys-cluster/ceph # --offline --no-save --verbose --parseable \ @@ -34,14 +42,15 @@ src_compile(){ } src_install(){ - local npm_module_dir="/usr/$(get_libdir)/node_modules/npm/node_modules/${PN}" + #this may be a wrong directory, but npm is a mess + local npm_module_dir="/usr/$(get_libdir)/node_modules/${PN}" + insinto "${npm_module_dir}" - doins *.js package.json usage.txt - doins -r lib64/node_modules/electron-packager/node_modules - dodoc CONTRIBUTING.md readme.md + doins -r {bin,node_modules,src,package.json,usage.txt} + dodoc CONTRIBUTING.md README.md use doc && dodoc -r docs - fperms +x "${npm_module_dir}/cli.js" - dosym "${npm_module_dir}/cli.js" "/usr/bin/${PN}" + fperms +x "${npm_module_dir}/bin/electron-packager.js" + dosym "${npm_module_dir}/bin/electron-packager.js" "/usr/bin/${PN}" } diff --git a/www-apps/BloodHound/BloodHound-3.0.0.ebuild b/www-apps/BloodHound/BloodHound-3.0.0.ebuild new file mode 100644 index 000000000..e6be42e79 --- /dev/null +++ b/www-apps/BloodHound/BloodHound-3.0.0.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils + +DESCRIPTION="Six Degrees of Domain Admin" +HOMEPAGE="https://github.com/BloodHoundAD/BloodHound" +SRC_URI="https://github.com/BloodHoundAD/BloodHound/archive/${PV}.tar.gz -> ${P}.tar.gz + https://dev.pentoo.ch/~blshkv/distfiles/${P}-node_modules.tar.gz" +#create modules using "npm install" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="" + +DEPEND=">=net-libs/nodejs-12.10.0[npm] + dev-util/electron-packager" +RDEPEND="${DEPEND} + gnome-base/gconf" + +BLOODHOUND_BINDIR="FAIL_TO_DETECT_ARCH" +QA_FLAGS_IGNORED="usr/lib.*/BloodHound/.*\.so" + +src_prepare() { + epatch "${FILESDIR}/${PV}-singlearch.patch" + mv ${WORKDIR}/node_modules ${S} + eapply_user +} + +src_compile() { + #npm shrinkwrap + #we provide node_modules, there is no need to install + #npm install \ + if use amd64; then + npm run linuxbuild_64 || die "Failed to compile" + BLOODHOUND_BINDIR="BloodHound-linux-x64" + elif use x86; then + npm run linuxbuild_32 || die "Failed to compile" + BLOODHOUND_BINDIR="BloodHound-linux-ia32" + elif use arm; then + npm run linuxbuild_arm || die "Failed to compile" + BLOODHOUND_BINDIR="BloodHound-linux-armv7l" + elif use arm64; then + npm run linuxbuild_arm64 || die "Failed to compile" + BLOODHOUND_BINDIR="BloodHound-linux-arm64" + fi +} + +src_install() { + dodir /usr/$(get_libdir)/${PN} + cp -R ${BLOODHOUND_BINDIR}/* "${ED}"/usr/$(get_libdir)/${PN} || die "Copy files failed" + + newbin - ${PN} <<-EOF + #!/bin/sh + cd /usr/$(get_libdir)/${PN} + LD_LIBRARY_PATH=. exec ./${PN} "\${@}" + EOF +} diff --git a/www-apps/BloodHound/Manifest b/www-apps/BloodHound/Manifest index c10734371..efa19ca51 100644 --- a/www-apps/BloodHound/Manifest +++ b/www-apps/BloodHound/Manifest @@ -4,3 +4,5 @@ DIST BloodHound-2.2.0-node_modules.tar.gz 87720159 BLAKE2B cb516e9c0d2d9d7417c3e DIST BloodHound-2.2.0.tar.gz 10186786 BLAKE2B a927f256e4eca9ccad5bb467d588d721aa4d3272ed4d491a37484ac8e71e23711186b8f252027c723523dc8df9482398f94f8e8188a042747a1652a3a98770a7 SHA512 efcb176c60c6bc04cadd3e47f9ad6b840fec9a13dfb6b01045d74ab136c349e2329414f8e645629ea7e469533960b2137dfb7dba8689cd13f0d1d370b5b9d4d4 DIST BloodHound-2.2.1-node_modules.tar.gz 88411631 BLAKE2B 8c9dc8dc573fffe62926eb23317414f6f35bdf89067b63e79419ee885f39461a688c787bfaa62da9c26a3cc6189454535bcd9d7d65f88a43eefc5984861cec95 SHA512 457b2d158be1926385339cb1fa74c1ded6a39e6e473a973f58d08ac8e5293a5f363dbbba862812f8cbf14e1aa95e6a9e1054062cdec69b0a86b89c65b9d6b624 DIST BloodHound-2.2.1.tar.gz 10187167 BLAKE2B 265fb31618d31afabab4228e7f2b757f51b8422462fae52d92bfb64020eba8dacef1adf5e18c8079a17dba57cc4597f371bdcb77353be427acb716894b5db221 SHA512 60a80be43b60bb3f2b69470516c29da33480fa05e97d638a5c21fad87053cddbeb0967421e3ff1fd5806edeee340a34b5c3b42478ce21f26e32ae439beedebd4 +DIST BloodHound-3.0.0-node_modules.tar.gz 97777268 BLAKE2B 196a564b791034131510d365ab6408581b694ba35574f129049c0c19001be1c309221726cac797c8ce36620f1a96fc7d0d6bc6f910ef7d3105cb5baec7ff926e SHA512 a0e53e6b0b585f61605364fc0f67d1c8620ac1b6377f6159f266cc1d2e0eedc9131db05922af8b46e7060f8715e0fdcf56fc6e15cd837c59daa54ecac2861bbd +DIST BloodHound-3.0.0.tar.gz 10368615 BLAKE2B eb920e64e43dda38515bd02346a66bb6359f31eee0501ece22834b5ca62e8c615e6f7ce426a56a39c6ac9167ef88935240aca356fb750f38eab232a506188548 SHA512 8703c82a7c1e82e1d0d601109dab15e119960fb5681b3e1bbbfb8c0cd0ad760f27ad6a1c4d5d2f9534ce8aa543784047b4e6ab6d3a8c279b9f71fd67225e7c6c diff --git a/www-apps/BloodHound/files/3.0.0-singlearch.patch b/www-apps/BloodHound/files/3.0.0-singlearch.patch new file mode 100644 index 000000000..05577a049 --- /dev/null +++ b/www-apps/BloodHound/files/3.0.0-singlearch.patch @@ -0,0 +1,14 @@ +--- package.json.orig 2020-02-12 02:44:33.000000000 +0800 ++++ package.json 2020-02-12 09:35:27.771921553 +0800 +@@ -31,7 +31,10 @@ + "dev": "concurrently -k \"babel-node server.js\" \"npm start\"", + "winbuild": "webpack --config webpack.config.production.js && electron-packager . BloodHound --platform=win32 --arch=all --overwrite --prune --ignore=./*.zip --ignore=./BloodHound.* --ignore=BloodHoundExampleDB.graphdb --ignore=Ingestors --ignore=node_modules/\\.bin --icon=src/img/icon.ico", + "macbuild": "webpack --config webpack.config.production.js && electron-packager . BloodHound --platform=darwin --arch=all --overwrite --prune --ignore=./*.zip --ignore=./BloodHound.* --ignore=BloodHoundExampleDB.graphdb --ignore=Ingestors --ignore=node_modules/\\.bin --icon=src/img/icon.icns", +- "linuxbuild": "webpack --config webpack.config.production.js && electron-packager . BloodHound --platform=linux --overwrite --prune --ignore=./*.zip --ignore=./BloodHound.* --ignore=BloodHoundExampleDB.graphdb --ignore=Ingestors --ignore=node_modules/\\.bin && electron-packager . BloodHound --platform=linux --overwrite --arch=armv7l --prune --ignore=./*.zip --ignore=./BloodHound.* --ignore=BloodHoundExampleDB.graphdb --ignore=Ingestors --ignore=node_modules/\\.bin && electron-packager . BloodHound --platform=linux --arch=arm64 --overwrite --prune --ignore=./*.zip --ignore=./BloodHound.* --ignore=BloodHoundExampleDB.graphdb --ignore=Ingestors --ignore=node_modules/\\.bin" ++ "linuxbuild_32": "webpack --config webpack.config.production.js && electron-packager . BloodHound --platform=linux --arch=ia32 --overwrite --prune --ignore=./*.zip --ignore=./BloodHound.* --ignore=BloodHoundExampleDB.graphdb --ignore=Ingestors --ignore=node_modules/\\.bin", ++ "linuxbuild_64": "webpack --config webpack.config.production.js && electron-packager . BloodHound --platform=linux --arch=x64 --overwrite --prune --ignore=./*.zip --ignore=./BloodHound.* --ignore=BloodHoundExampleDB.graphdb --ignore=Ingestors --ignore=node_modules/\\.bin", ++ "linuxbuild_arm": "webpack --config webpack.config.production.js && electron-packager . BloodHound --platform=linux --arch=armv71 --overwrite --prune --ignore=./*.zip --ignore=./BloodHound.* --ignore=BloodHoundExampleDB.graphdb --ignore=Ingestors --ignore=node_modules/\\.bin", ++ "linuxbuild_arm64": "webpack --config webpack.config.production.js && electron-packager . BloodHound --platform=linux --arch=arm64 --overwrite --prune --ignore=./*.zip --ignore=./BloodHound.* --ignore=BloodHoundExampleDB.graphdb --ignore=Ingestors --ignore=node_modules/\\.bin" + }, + "babel": { + "presets": [ diff --git a/www-apps/seafile-pro-server/seafile-pro-server-7.0.13.ebuild b/www-apps/seafile-pro-server/seafile-pro-server-7.0.13.ebuild index 765ca5ec7..ef36b49e4 100644 --- a/www-apps/seafile-pro-server/seafile-pro-server-7.0.13.ebuild +++ b/www-apps/seafile-pro-server/seafile-pro-server-7.0.13.ebuild @@ -3,7 +3,7 @@ EAPI=7 PYTHON_COMPAT=( python2_7 ) -inherit autotools python-single-r1 +inherit python-single-r1 DESCRIPTION="Meta package for Seafile Pro Edition, file sync share solution" HOMEPAGE="https://github.com/haiwen/seafile-server/ http://www.seafile.com/" @@ -13,21 +13,20 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="fuse" -#list of deps ./ci/requirements.txt RDEPEND="${PYTHON_DEPS} fuse? ( sys-fs/fuse:* ) sys-libs/libselinux dev-libs/nss - - dev-python/ldap3[${PYTHON_USEDEP}] - dev-python/urllib3[${PYTHON_USEDEP}] - dev-python/mysql-python[${PYTHON_USEDEP}] - dev-python/python-memcached[${PYTHON_USEDEP}] - >=dev-python/requests-2.8.0[${PYTHON_USEDEP}] - =dev-python/pillow-6*[${PYTHON_USEDEP}] - virtual/jre:*" +# system-python? ( +# $(python_gen_cond_dep ' +# dev-python/ldap3[${PYTHON_MULTI_USEDEP}] +# dev-python/urllib3[${PYTHON_MULTI_USEDEP}] +# dev-python/mysql-python[${PYTHON_MULTI_USEDEP}] +# dev-python/python-memcached[${PYTHON_MULTI_USEDEP}] +# >=dev-python/requests-2.8.0[${PYTHON_MULTI_USEDEP}] +# =dev-python/pillow-6*[${PYTHON_MULTI_USEDEP}] +# ') +# ) -DEPEND=" - ${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}"