diff --git a/pentoo/pentoo-misc/pentoo-misc-2018.1.ebuild b/pentoo/pentoo-misc/pentoo-misc-2018.2.ebuild similarity index 93% rename from pentoo/pentoo-misc/pentoo-misc-2018.1.ebuild rename to pentoo/pentoo-misc/pentoo-misc-2018.2.ebuild index 8ca40d41a..623c34851 100644 --- a/pentoo/pentoo-misc/pentoo-misc-2018.1.ebuild +++ b/pentoo/pentoo-misc/pentoo-misc-2018.2.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="http://www.pentoo.ch" KEYWORDS="amd64 arm x86" SLOT="0" LICENSE="GPL-3" -IUSE="+accessibility +atm gtk java qt4 +office X minipentoo" +IUSE="+accessibility +atm gtk java +office X minipentoo" DEPEND="" RDEPEND="${DEPEND} @@ -27,7 +27,6 @@ RDEPEND="${DEPEND} accessibility? ( app-accessibility/espeakup app-accessibility/brltty ) gtk? ( media-video/gtk-recordmydesktop ) - qt4? ( !gtk? ( media-video/recordmydesktop ) ) X? ( app-editors/gedit office? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) app-editors/ghex diff --git a/profiles/pentoo/base/package.use/dev-python b/profiles/pentoo/base/package.use/dev-python index b565bed34..2016a3641 100644 --- a/profiles/pentoo/base/package.use/dev-python +++ b/profiles/pentoo/base/package.use/dev-python @@ -1,8 +1,5 @@ dev-python/capstone-python cython -#required by fern-wifi-cracker and kde -dev-python/PyQt4 compat webkit declarative sql script - # required by w3af dev-python/nltk dev-lang/python tk diff --git a/profiles/pentoo/base/package.use/net-analyzer b/profiles/pentoo/base/package.use/net-analyzer index b40485199..f5fb0a7f3 100644 --- a/profiles/pentoo/base/package.use/net-analyzer +++ b/profiles/pentoo/base/package.use/net-analyzer @@ -5,7 +5,7 @@ net-analyzer/rrdtool -ruby graph net-analyzer/scapy gnuplot tcpreplay net-analyzer/snort dynamicplugin zlib net-analyzer/ucsniff ffmpeg plugins -net-analyzer/wireshark gcrypt gnutls kerberos threads ares geoip portaudio smi -qt4 +net-analyzer/wireshark gcrypt gnutls kerberos threads ares geoip portaudio smi #https://bugs.gentoo.org/show_bug.cgi?id=334329 #net-analyzer/tcpdump -chroot diff --git a/profiles/pentoo/base/package.use/x11-libs b/profiles/pentoo/base/package.use/x11-libs index 699959eed..fe2af85f5 100644 --- a/profiles/pentoo/base/package.use/x11-libs +++ b/profiles/pentoo/base/package.use/x11-libs @@ -1,11 +1,7 @@ -x11-libs/cairo glib svg -qt4 x11-libs/fltk threads xft x11-libs/libdrm libkms x11-libs/vte python x11-libs/wxGTK gstreamer tiff #required by sqlitebrowser -x11-libs/qscintilla -qt4 qt5 - -#gnuradio -x11-libs/qwt qt4 +x11-libs/qscintilla qt5