diff --git a/app-antivirus/tyton/Manifest b/app-antivirus/tyton/Manifest index 1fbfee5b3..fbce8cdb1 100644 --- a/app-antivirus/tyton/Manifest +++ b/app-antivirus/tyton/Manifest @@ -1,2 +1 @@ -DIST tyton-1.2_p20181206.tar.gz 153824 BLAKE2B 0f4531b068088e55a7be5f51b20ba73d397892db313470c0a9cfad75eaa60de06125667ef45ab54f6580a4c95a546701f34678b75d5abdb298fc1d84d86ed613 SHA512 748b8eb7f543e617553a92e0403ab771e8e515680ae804db9aacfa10eafb94a13c9e18fd75627062c800fdfa546dfda8b87dbf035a7f9760bd59394268982025 DIST tyton-1.2_p20200604.tar.gz 154004 BLAKE2B 1b48c84361a4a4a22fba194f26d234c241abfa91dbc69fe3097737a43db05bbe8fd56455a8df44597300bcbf21a4b8345558da832af32c939bfb43b039b8be89 SHA512 ce194a2232a076661c87725ad2014efc6d5a4aace58b523e14d24e5f3502a7961c7ff77709dd82274c451043f22728b475968984b2d73fa7f001d5acaaadd5c1 diff --git a/app-antivirus/tyton/tyton-1.2_p20181206.ebuild b/app-antivirus/tyton/tyton-1.2_p20181206.ebuild deleted file mode 100644 index e9a7e34f1..000000000 --- a/app-antivirus/tyton/tyton-1.2_p20181206.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit linux-mod linux-info - -HASH_COMMIT="c527bff7dfd958e2572d60b791615ea9e27ffe85" - -DESCRIPTION="Kernel-Mode Rootkit Hunter" -HOMEPAGE="https://github.com/nbulischeck/tyton/" -SRC_URI="https://github.com/nbulischeck/tyton/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-3" -SLOT="0" - -KEYWORDS="~amd64 ~x86" -IUSE="" - -#FIXME: add notify daemon: -#x11-libs/gtk+:3 -#x11-libs/libnotify -#sys-apps/systemd - -S="${WORKDIR}/${PN}-${HASH_COMMIT}" - -MODULE_NAMES="tyton(misc:${S}:${S})" -CONFIG_CHECK="NETFILTER_FAMILY_ARP" -BUILD_PARAMS="-j1" - -pkg_setup() { - linux-mod_pkg_setup -} diff --git a/app-antivirus/tyton/tyton-1.2_p20200604.ebuild b/app-antivirus/tyton/tyton-1.2_p20200604.ebuild index 74a381cdc..37c35abef 100644 --- a/app-antivirus/tyton/tyton-1.2_p20200604.ebuild +++ b/app-antivirus/tyton/tyton-1.2_p20200604.ebuild @@ -14,7 +14,7 @@ LICENSE="GPL-3" SLOT="0" #https://github.com/nbulischeck/tyton/issues/19 -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" S="${WORKDIR}/${PN}-${HASH_COMMIT}" diff --git a/dev-embedded/libmpsse/Manifest b/dev-embedded/libmpsse/Manifest index db7f21f98..18586f2fe 100644 --- a/dev-embedded/libmpsse/Manifest +++ b/dev-embedded/libmpsse/Manifest @@ -1,2 +1 @@ DIST libmpsse-1.3.2.tar.gz 612188 BLAKE2B 8f71c9fe00f7bedbe63daab47efd72cc287bfa28b325e7364d70e9a1b2262cc4dd4e74beea0157db2d8f3b78b0420f6e0e823ed64abd2d36ed8ff36ec824cb5d SHA512 680d3c4d0fc8fa4fdf6b0cde024290524cac1085c4c71ec4f22ef946b2c6eb50cab9f005044998771a79f16089b0dfef667f4dd15b3bb3320920281073ee876d -DIST libmpsse-1.3_p20160602.zip 657257 BLAKE2B d4e09a05e413ef6ab4e9700b0d2f406d746e641ee3c0c99ecd11e240f50d7bf6693400b08c1e831d1ab402bbff796fc0114b21311a4572e05d500e78ef4b285c SHA512 8d2f30cdfed496b565590da70c0b78966a68dc10d10903e6708f49ccb12ae9353bb63eaab5c35fc8ab7caf0503c5aceb6b6f2ca2322ea0ebddcdd2b2fbe88acc diff --git a/dev-embedded/libmpsse/libmpsse-1.3.2.ebuild b/dev-embedded/libmpsse/libmpsse-1.3.2.ebuild index 5c74c87a0..054089054 100644 --- a/dev-embedded/libmpsse/libmpsse-1.3.2.ebuild +++ b/dev-embedded/libmpsse/libmpsse-1.3.2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/l29ah/libmpsse/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="doc examples python" RDEPEND="dev-embedded/libftdi:*" diff --git a/dev-embedded/libmpsse/libmpsse-1.3_p20160602.ebuild b/dev-embedded/libmpsse/libmpsse-1.3_p20160602.ebuild deleted file mode 100644 index dbe548619..000000000 --- a/dev-embedded/libmpsse/libmpsse-1.3_p20160602.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGIT_COMMIT="a2eafa24a3446a711b13523ec06c17b5a1c6cdc1" -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-single-r1 - -DESCRIPTION="Open source library for SPI/I2C control via FTDI chips" -HOMEPAGE="https://code.google.com/p/libmpsse" -SRC_URI="https://github.com/devttys0/libmpsse/archive/${EGIT_COMMIT}.zip -> ${P}.zip" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc examples python" - -RDEPEND="dev-embedded/libftdi:0" -DEPEND="dev-lang/swig - ${RDEPEND}" - -#https://github.com/devttys0/libmpsse/issues/16 -#MAKEOPTS="${MAKEOPTS} -j1" - -S="${WORKDIR}/${PN}-${EGIT_COMMIT}/src" - -src_configure() { - epatch "${FILESDIR}/pr-libmpsse-objconf.patch" - econf $(use_enable python ) -} - -src_install() { - emake DESTDIR="${D}" install - dodoc ../docs/README* - if use doc ; then - dodoc ../docs/AN_135_MPSSE_Basics.pdf - fi - if use examples ; then - insinto /usr/share/${PN}/ - doins -r examples - fi -} diff --git a/dev-embedded/mphidflash/Manifest b/dev-embedded/mphidflash/Manifest index 631124a0f..7926fbcc3 100644 --- a/dev-embedded/mphidflash/Manifest +++ b/dev-embedded/mphidflash/Manifest @@ -1,2 +1 @@ -DIST mphidflash-1.6-src.tar.gz 27426 SHA256 303169dee7a0658380989287167d475e716168f588e5a8a7e751c33f16ae7850 SHA512 fbf72ba81a6004fcfb6f47346e643c7772465bcb449686f2ef8b01dc00159f0455ee64e6d8747de29bb1ef989e10d2153f1aa9c79f8d41bded57e5c6543cc76b WHIRLPOOL 28218bdff8cd3bd1b5520364c75b7ef6379daab9f25d2cf0e8117960b62df25a469a3224f0ee3dd3eda571159fc2d06f9921e50ed347e2c24243cc83bb868759 -DIST mphidflash-1.8-src.tar.gz 28000 SHA256 af2337218c86ab98750a3dd407cb74ea8b9e18b6ad01a126d83ec7fb401997f9 SHA512 09a6d0bd0809cd6cb4e0b26fbe83282f54a43649e72ebcbe13978d0610c24f1072c6447910f4aa768e9fc34390ad3eb526e8d29f281a57b428374d89f423db22 WHIRLPOOL 5494cc5940c3e1277160f9c1e42ab25c8cb2d550f29c728fd7a0574900b9185a57a76ed067a2a0d81ff795fdb2535ed2648cf3613d4fa0ce01589b6166b83413 +DIST mphidflash-1.8-src.tar.gz 28000 BLAKE2B d38a76c888b30efcf5e9754abda39da78ed19badda3e270b52b89c2cce04ed5a9fc173be05fe41d42af0f83e08cedf6b8ff088e9e00c102b1d1b095d3f7e801e SHA512 09a6d0bd0809cd6cb4e0b26fbe83282f54a43649e72ebcbe13978d0610c24f1072c6447910f4aa768e9fc34390ad3eb526e8d29f281a57b428374d89f423db22 diff --git a/dev-embedded/mphidflash/mphidflash-1.6.ebuild b/dev-embedded/mphidflash/mphidflash-1.6.ebuild deleted file mode 100644 index 7f2d5815b..000000000 --- a/dev-embedded/mphidflash/mphidflash-1.6.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils - -DESCRIPTION="Tool for communicating with the USB-Bootloader in PIC microcontrollers" -HOMEPAGE="https://github.com/ApertureLabsLtd/mphidflash" -#SRC_URI="https://mphidflash.googlecode.com/svn/trunk/dist/${P}-src.tar.gz" -SRC_URI="http://dev.pentoo.ch/~zero/distfiles/${P}-src.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="" - -DEPEND="virtual/libusb:0 - dev-libs/libhid" -RDEPEND="${DEPEND}" - -S="${WORKDIR}" - -src_prepare() { - epatch "${FILESDIR}"/"${P}"-makefile.patch - default -} - -src_compile() { - use x86 && emake mphidflash32 - use amd64 && emake mphidflash64 -} - -src_install() { - use x86 && newbin ${P}-linux-32 ${PN} - use amd64 && newbin ${P}-linux-64 ${PN} -} diff --git a/dev-embedded/mphidflash/mphidflash-1.8.ebuild b/dev-embedded/mphidflash/mphidflash-1.8.ebuild index 1114da96a..7dcfddf61 100644 --- a/dev-embedded/mphidflash/mphidflash-1.8.ebuild +++ b/dev-embedded/mphidflash/mphidflash-1.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ SRC_URI="https://github.com/ApertureLabsLtd/mphidflash/raw/master/dist/${P}-src. LICENSE="GPL-3" SLOT="0" -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="-* amd64 x86" IUSE="" DEPEND="virtual/libusb:0 diff --git a/dev-java/gradle-bin/gradle-bin-5.2.1.ebuild b/dev-java/gradle-bin/gradle-bin-5.2.1.ebuild index 6172da13e..079747d35 100644 --- a/dev-java/gradle-bin/gradle-bin-5.2.1.ebuild +++ b/dev-java/gradle-bin/gradle-bin-5.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ HOMEPAGE="http://www.gradle.org/" LICENSE="Apache-2.0" SLOT="${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" RDEPEND=" >=virtual/jdk-1.6" diff --git a/dev-java/jd-core/jd-core-1.0.6.ebuild b/dev-java/jd-core/jd-core-1.0.6.ebuild index dc7170dab..51054d200 100644 --- a/dev-java/jd-core/jd-core-1.0.6.ebuild +++ b/dev-java/jd-core/jd-core-1.0.6.ebuild @@ -11,12 +11,12 @@ SRC_URI="https://github.com/java-decompiler/jd-core/archive/v${PV}.tar.gz -> ${P LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" -RDEPEND=">=virtual/jre-1.8:*" +RDEPEND="virtual/jre:*" DEPEND="${RDEPEND} - >=virtual/jdk-1.8:*" + virtual/jdk:*" S="${WORKDIR}/${P}" diff --git a/dev-java/jgraphx/jgraphx-2.1.1.2.ebuild b/dev-java/jgraphx/jgraphx-2.1.1.2.ebuild index 56bceb7bc..36e877410 100644 --- a/dev-java/jgraphx/jgraphx-2.1.1.2.ebuild +++ b/dev-java/jgraphx/jgraphx-2.1.1.2.ebuild @@ -12,12 +12,12 @@ DESCRIPTION="Open-source graph component for Java" SRC_URI="https://github.com/jgraph/jgraphx/archive/v${PV}.tar.gz -> ${P}.tar.gz" HOMEPAGE="http://www.jgraph.com" IUSE="doc examples source" -DEPEND=">=virtual/jdk-1.5 +DEPEND="virtual/jdk:1.8 app-arch/unzip" RDEPEND=">=virtual/jre-1.5" LICENSE="BSD" SLOT="$(ver_cut 1-2)" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" src_prepare() { # don't do javadoc always diff --git a/dev-java/jgraphx/jgraphx-4.0.6.ebuild b/dev-java/jgraphx/jgraphx-4.0.6.ebuild index 56bceb7bc..36e877410 100644 --- a/dev-java/jgraphx/jgraphx-4.0.6.ebuild +++ b/dev-java/jgraphx/jgraphx-4.0.6.ebuild @@ -12,12 +12,12 @@ DESCRIPTION="Open-source graph component for Java" SRC_URI="https://github.com/jgraph/jgraphx/archive/v${PV}.tar.gz -> ${P}.tar.gz" HOMEPAGE="http://www.jgraph.com" IUSE="doc examples source" -DEPEND=">=virtual/jdk-1.5 +DEPEND="virtual/jdk:1.8 app-arch/unzip" RDEPEND=">=virtual/jre-1.5" LICENSE="BSD" SLOT="$(ver_cut 1-2)" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" src_prepare() { # don't do javadoc always diff --git a/net-mail/davmail-bin/Manifest b/net-mail/davmail-bin/Manifest index 4978fa3f9..72a3fe746 100644 --- a/net-mail/davmail-bin/Manifest +++ b/net-mail/davmail-bin/Manifest @@ -1,2 +1 @@ -DIST davmail-5.4.0-3135.zip 6311121 BLAKE2B 29ec02acb84c4b3ffb1774a5d9b3a228ce7ba3fd3085cccd0b3dfbcab081a40c3ade3f089dd5df6388314ef77c3fb75b303dacef3dbf6e6a0d5695cc374bd0cb SHA512 0cf0464c1d4edbd1060dbedccd8cf5a588ef0093ebf2ef0dcf97adc25eaaf189b37808d0725104b82c6a6d23b6d1f842341ed47d73074e9aabff1ce0cc28f066 DIST davmail-5.5.1-3299.zip 7043999 BLAKE2B 8c6a291da2211aa5e1c2f129a2ffadb4b26ff5ee81962cf20699d9d069cc0199dd3a1e7a5c57276f5f090f23452be2f890bdfca31f6d833fa4b03f6b05b7059a SHA512 e731f6c8af6f019bd7891bd759b0f687f72ff1a7dabaf5e6bb4bb70ebd715820996ecba1d5ad40720438542652be47c15d637b944142924ac00aaecbb4be0746 diff --git a/net-mail/davmail-bin/davmail-bin-5.4.0.3135.ebuild b/net-mail/davmail-bin/davmail-bin-5.4.0.3135.ebuild deleted file mode 100644 index b5a5aac0b..000000000 --- a/net-mail/davmail-bin/davmail-bin-5.4.0.3135.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit eutils java-pkg-2 user - -#https://sourceforge.net/projects/davmail/files/davmail/ -MY_PN="davmail" - -DESCRIPTION="POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway" -HOMEPAGE="http://davmail.sourceforge.net/" -SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-$(ver_cut 1-3)-$(ver_cut 4).zip" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="server" - -DEPEND="|| ( - >=virtual/jre-1.6:* - >=virtual/jdk-1.6:* - ) - !net-mail/davmail" -RDEPEND="${DEPEND}" -S="${WORKDIR}" - -pkg_setup() { - if use server ; then - enewuser davmail -1 -1 /dev/null - fi -} - -java-pkg-2_src_compile() { - einfo "" -} - -src_install() { - # libraries - java-pkg_dojar lib/*.jar - java-pkg_dojar ${MY_PN}.jar - - # icon -# doicon "${FILESDIR}"/${MY_PN}.png - - # create wrapper script for the client - java-pkg_dolauncher ${MY_PN} --main ${MY_PN}.DavGateway --java_args "" - - # desktop entry - make_desktop_entry ${MY_PN} "DavMail" /usr/share/pixmaps/${MY_PN}.png "Network" - - if use server ; then - # log file - touch ${MY_PN}.log - insinto /var/log - doins ${MY_PN}.log - fowners ${MY_PN} /var/log/${MY_PN}.log - - # config files - insinto /etc - doins "${FILESDIR}"/${MY_PN}.properties - newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN} - newconfd "${FILESDIR}"/${MY_PN}.conf ${MY_PN} - fi -} - -pkg_postinst() { - if use server ; then - elog - elog "You have chosen to run ${MY_PN} as a system service. You will need to" - elog "modify /etc/${MY_PN}.properties to serve your needs." - elog - elog "You may find it easier to run the ${MY_PN}, configure it via the GUI" - elog "and copy the resulting ~/.${MY_PN}.properties to /etc. Make sure you" - elog "set ${MY_PN}.server=true and ${MY_PN}.allowRemote=true." - elog - fi -} diff --git a/net-mail/davmail-bin/davmail-bin-5.5.1.3299.ebuild b/net-mail/davmail-bin/davmail-bin-5.5.1.3299.ebuild index e0ad58cdd..9f9334881 100644 --- a/net-mail/davmail-bin/davmail-bin-5.5.1.3299.ebuild +++ b/net-mail/davmail-bin/davmail-bin-5.5.1.3299.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}-$(ver_cut 1-3)-$(ver_cut 4).zip" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="server" DEPEND="|| ( >=virtual/jre-1.6:* diff --git a/profiles/pentoo/base/package.accept_keywords/dev-java b/profiles/pentoo/base/package.accept_keywords/dev-java index 20a10ac70..0cb2750b3 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-java +++ b/profiles/pentoo/base/package.accept_keywords/dev-java @@ -1,19 +1,9 @@ ~dev-java/sleep-2.1 -#required by "net-analyzer/armitage -dev-java/jgraphx:2.1 - ~dev-java/msgpack-0.6.12 -dev-java/msgpack:8.16 - -dev-java/gradle-bin:5.2.1 =dev-java/gradle-bin-6* -dev-java/oracle-jdk-bin:11 - -dev-java/jd-core - #ghidra virtual/jdk:11 dev-java/openjdk-bin:11 @@ -23,4 +13,7 @@ dev-java/openjdk-jre-bin:11 #recaf dev-java/swt:4.10 -~dev-java/ant-core-1.10.7 + +# downgrade back to stable (and install python2) if dev-java/oracle-javamail fails to compile +# https://bugs.gentoo.org/698954 +=dev-java/javatoolkit-0.6.1* diff --git a/profiles/pentoo/base/package.accept_keywords/dev-vcs b/profiles/pentoo/base/package.accept_keywords/dev-vcs deleted file mode 100644 index b57e8f708..000000000 --- a/profiles/pentoo/base/package.accept_keywords/dev-vcs +++ /dev/null @@ -1,5 +0,0 @@ -~dev-vcs/gitleaks-4.1.0 - -#needed for python3 -#except it doesn't build... -#=dev-vcs/subversion-1.14* diff --git a/profiles/pentoo/base/package.accept_keywords/misc b/profiles/pentoo/base/package.accept_keywords/misc deleted file mode 100644 index b076ce4c4..000000000 --- a/profiles/pentoo/base/package.accept_keywords/misc +++ /dev/null @@ -1,21 +0,0 @@ -####### pentoo ######### -app-antivirus/tyton - -#required by "net-wireless/rfidler -dev-embedded/mphidflash - -dev-embedded/libmpsse - -net-mail/davmail-bin - -#Grammarly alternative -=app-officeext/languagetool-4.4* - -####### gentoo ####### -~net-firewall/sanewall-1.1.6 - -~net-nds/jxplorer-3.3.1.2 - -# downgrade back to stable (and install python2) if dev-java/oracle-javamail fails to compile -# https://bugs.gentoo.org/698954 -=dev-java/javatoolkit-0.6.1* diff --git a/profiles/pentoo/base/package.keywords/net-firewall b/profiles/pentoo/base/package.keywords/net-firewall new file mode 100644 index 000000000..0fe4a7a8e --- /dev/null +++ b/profiles/pentoo/base/package.keywords/net-firewall @@ -0,0 +1 @@ +~net-firewall/sanewall-1.1.6 amd64 x86 diff --git a/profiles/pentoo/base/package.keywords/net-nds b/profiles/pentoo/base/package.keywords/net-nds new file mode 100644 index 000000000..9f5cc684a --- /dev/null +++ b/profiles/pentoo/base/package.keywords/net-nds @@ -0,0 +1 @@ +~net-nds/jxplorer-3.3.1.2 diff --git a/profiles/pentoo/overlay/package.keywords/net-firewall b/profiles/pentoo/overlay/package.keywords/net-firewall new file mode 120000 index 000000000..ab29b3591 --- /dev/null +++ b/profiles/pentoo/overlay/package.keywords/net-firewall @@ -0,0 +1 @@ +../../base/package.keywords/net-firewall \ No newline at end of file diff --git a/profiles/pentoo/overlay/package.keywords/net-nds b/profiles/pentoo/overlay/package.keywords/net-nds new file mode 120000 index 000000000..54d4b2ccd --- /dev/null +++ b/profiles/pentoo/overlay/package.keywords/net-nds @@ -0,0 +1 @@ +../../base/package.keywords/net-nds \ No newline at end of file