diff --git a/app-forensics/sleuthkit/sleuthkit-4.1.3.ebuild b/app-forensics/sleuthkit/sleuthkit-4.1.3-r1.ebuild similarity index 82% rename from app-forensics/sleuthkit/sleuthkit-4.1.3.ebuild rename to app-forensics/sleuthkit/sleuthkit-4.1.3-r1.ebuild index 844b4ff30..703a6f7fb 100644 --- a/app-forensics/sleuthkit/sleuthkit-4.1.3.ebuild +++ b/app-forensics/sleuthkit/sleuthkit-4.1.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -16,9 +16,11 @@ SLOT="0/10" # subslot = major soname version KEYWORDS="~amd64 ~hppa ~ppc ~x86" IUSE="aff ewf static-libs" -DEPEND="dev-db/sqlite:3 - ewf? ( >=app-forensics/libewf-20170701 ) - aff? ( app-forensics/afflib )" +DEPEND="virtual/jdk + dev-db/sqlite:3 + sys-libs/zlib:= + ewf? ( >=app-forensics/libewf-20170701:= ) + aff? ( app-forensics/afflib:= )" RDEPEND="${DEPEND} dev-perl/Date-Manip" diff --git a/pentoo/pentoo-system/pentoo-system-2017.4.ebuild b/pentoo/pentoo-system/pentoo-system-2017.4-r1.ebuild similarity index 99% rename from pentoo/pentoo-system/pentoo-system-2017.4.ebuild rename to pentoo/pentoo-system/pentoo-system-2017.4-r1.ebuild index 5fb859124..12046fc1c 100644 --- a/pentoo/pentoo-system/pentoo-system-2017.4.ebuild +++ b/pentoo/pentoo-system/pentoo-system-2017.4-r1.ebuild @@ -111,6 +111,7 @@ PDEPEND="${PDEPEND} sys-apps/ethtool sys-apps/iproute2 sys-apps/fbset + sys-apps/fwts sys-apps/sysvinit sys-apps/rng-tools sys-devel/crossdev diff --git a/profiles/pentoo/arch/x86/package.accept_keywords b/profiles/pentoo/arch/x86/package.accept_keywords index 48fb2e5b8..5dbff6d31 100644 --- a/profiles/pentoo/arch/x86/package.accept_keywords +++ b/profiles/pentoo/arch/x86/package.accept_keywords @@ -1,4 +1,5 @@ =dev-ruby/tilt-2.0.5 +=dev-ruby/rbnacl-4.0* ** dev-python/numpy amd64 dev-ruby/eventmachine amd64 dev-ruby/tzinfo amd64 @@ -24,6 +25,7 @@ dev-ruby/ruby-gtk2 amd64 dev-ruby/ruby-pango amd64 net-misc/iprange amd64 dev-ruby/rack-protection amd64 +dev-ruby/rack-test amd64 dev-ruby/rcairo amd64 =app-crypt/yubikey-manager-0.4* ~amd64 ~dev-ruby/nio4r-2.1.0 ** @@ -42,3 +44,5 @@ net-analyzer/metasploit:4.14 ** ~dev-ruby/arel-helpers-2.4.0 ** ~dev-ruby/postgres_ext-3.0.0 ** ~dev-ruby/pg_array_parser-0.0.9 ** +www-client/chromium amd64 +=dev-python/scapy-python3-0.21* ~amd64 diff --git a/profiles/pentoo/base/package.accept_keywords/dev-libs b/profiles/pentoo/base/package.accept_keywords/dev-libs index 94322f7c5..177bb9d62 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-libs +++ b/profiles/pentoo/base/package.accept_keywords/dev-libs @@ -1,3 +1,6 @@ +#ugh https://bugs.gentoo.org/627576 +~dev-libs/elfutils-0.170 + #new kismet dev-libs/msgpack diff --git a/profiles/pentoo/base/package.accept_keywords/dev-ruby b/profiles/pentoo/base/package.accept_keywords/dev-ruby index fea6e056b..d2e2c40cb 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-ruby +++ b/profiles/pentoo/base/package.accept_keywords/dev-ruby @@ -15,6 +15,7 @@ dev-ruby/activejob:4.2 dev-ruby/actionview:4.2 #ruby23 +~dev-ruby/daemons-1.2.4 ~dev-ruby/did_you_mean-1.0.2 ~dev-ruby/rdoc-5.1.0 =dev-ruby/test-unit-3.2* @@ -37,7 +38,7 @@ dev-ruby/json:2 =dev-ruby/nokogiri-1.7* =dev-ruby/rack-1.6* =dev-ruby/hoe-3.16* -=dev-ruby/tins-1.13* +=dev-ruby/tins-1.15* ~dev-ruby/webmock-1.24.6 =dev-ruby/hashdiff-0.3* ~dev-ruby/racc-1.4.14 @@ -54,9 +55,9 @@ dev-ruby/i18n:0.7 ~dev-ruby/http_configuration-1.0.4 #required by metasploit-9999 +~dev-ruby/bcrypt_pbkdf-1.0.0 ** dev-ruby/rbnacl:4 dev-ruby/rbnacl-libsodium -dev-ruby/bcrypt_pbkdf =dev-ruby/faraday-0.12* dev-ruby/rjb ~dev-ruby/backports-3.8.0 @@ -89,7 +90,7 @@ dev-ruby/rex-text dev-ruby/bit-struct ~dev-ruby/sshkey-1.8.0 =dev-ruby/minitest-5.3* -=dev-ruby/msgpack-0.7* +=dev-ruby/msgpack-1.1* =dev-ruby/rake-10.5* dev-ruby/rkelly-remix dev-ruby/arel:6.0 diff --git a/profiles/pentoo/base/package.accept_keywords/sys-apps b/profiles/pentoo/base/package.accept_keywords/sys-apps new file mode 100644 index 000000000..f2d2a4e7c --- /dev/null +++ b/profiles/pentoo/base/package.accept_keywords/sys-apps @@ -0,0 +1 @@ +sys-apps/fwts diff --git a/profiles/pentoo/base/package.mask b/profiles/pentoo/base/package.mask index 62dc02783..da95974fd 100644 --- a/profiles/pentoo/base/package.mask +++ b/profiles/pentoo/base/package.mask @@ -19,3 +19,6 @@ sys-apps/systemd #kill old ruby dev-lang/ruby:2.1 dev-lang/ruby:2.2 + +#ugh, https://bugs.gentoo.org/627576 +