diff options
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild | 22 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild | 22 |
2 files changed, 6 insertions, 38 deletions
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild index 80c06b04b624..30aaaa87ceef 100644 --- a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild @@ -11,8 +11,8 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +IUSE="+X doc debug gstreamer libnotify opengl sdl tiff" SLOT="3.0" @@ -35,11 +35,6 @@ RDEPEND=" libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] ) opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) - ) - aqua? ( - x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) )" DEPEND="${RDEPEND} @@ -96,19 +91,8 @@ multilib_src_configure() { $(use_with opengl) $(use_with tiff libtiff sys)" - use aqua && \ - myconf="${myconf} - --enable-graphics_ctx - --enable-gui - --with-libpng=sys - --with-libxpm=sys - --with-libjpeg=sys - --with-mac - --with-opengl" - # cocoa toolkit seems to be broken - # wxBase options - if use !X && use !aqua ; then + if use !X ; then myconf="${myconf} --disable-gui" fi diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild index e165e79b71ea..d147f35a694a 100644 --- a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild @@ -11,8 +11,8 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +IUSE="+X doc debug gstreamer libnotify opengl sdl tiff webkit" WXSUBVERSION=${PV}.0-gtk3 # 3.0.3.0-gtk3 WXVERSION=${WXSUBVERSION%.*} # 3.0.3 @@ -43,11 +43,6 @@ RDEPEND=" opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) webkit? ( net-libs/webkit-gtk:4 ) - ) - aqua? ( - x11-libs/gtk+:3[aqua=,${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) )" DEPEND="${RDEPEND} @@ -130,19 +125,8 @@ multilib_src_configure() { $(use_with opengl) $(use_with tiff libtiff sys)" - use aqua && \ - myconf="${myconf} - --enable-graphics_ctx - --enable-gui - --with-libpng=sys - --with-libxpm=sys - --with-libjpeg=sys - --with-mac - --with-opengl" - # cocoa toolkit seems to be broken - # wxBase options - if use !X && use !aqua ; then + if use !X ; then myconf="${myconf} --disable-gui" fi |