summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Väth <martin@mvath.de>2018-05-07 23:17:25 +0200
committerMartin Väth <martin@mvath.de>2018-05-07 23:17:25 +0200
commit094d1baa446a429adf4d090893acf7f7c7dd1c49 (patch)
treea7e50c7135cecf533bb6895a0a1df8cbfe8d0d09 /x11-libs
parentx11-libs/gtk+: Version bump. Remove old (diff)
downloadmv-094d1baa446a429adf4d090893acf7f7c7dd1c49.tar.gz
mv-094d1baa446a429adf4d090893acf7f7c7dd1c49.tar.bz2
mv-094d1baa446a429adf4d090893acf7f7c7dd1c49.zip
Minor cleanups/EAPI bumps
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/gtk+/gtk+-2.24.32.ebuild2
-rw-r--r--x11-libs/gtk+/gtk+-3.22.30.ebuild1
-rw-r--r--x11-libs/motif/motif-2.3.8-r1.ebuild8
3 files changed, 6 insertions, 5 deletions
diff --git a/x11-libs/gtk+/gtk+-2.24.32.ebuild b/x11-libs/gtk+/gtk+-2.24.32.ebuild
index 93f891f5..3964d1cc 100644
--- a/x11-libs/gtk+/gtk+-2.24.32.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.32.ebuild
@@ -9,7 +9,7 @@ inherit eutils flag-o-matic gnome2 multilib multilib-minimal readme.gentoo-r1 vi
DESCRIPTION="Gimp ToolKit +"
HOMEPAGE="https://www.gtk.org/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+SRC_URI=${SRC_URI}" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
LICENSE="LGPL-2+"
SLOT="2"
diff --git a/x11-libs/gtk+/gtk+-3.22.30.ebuild b/x11-libs/gtk+/gtk+-3.22.30.ebuild
index f91996cc..61faaa0e 100644
--- a/x11-libs/gtk+/gtk+-3.22.30.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.30.ebuild
@@ -8,6 +8,7 @@ inherit autotools flag-o-matic gnome2 multilib virtualx multilib-minimal
DESCRIPTION="Gimp ToolKit +"
HOMEPAGE="https://www.gtk.org/"
+SRC_URI=${SRC_URI}
LICENSE="LGPL-2+"
SLOT="3"
diff --git a/x11-libs/motif/motif-2.3.8-r1.ebuild b/x11-libs/motif/motif-2.3.8-r1.ebuild
index 0e8a8d09..9b93a483 100644
--- a/x11-libs/motif/motif-2.3.8-r1.ebuild
+++ b/x11-libs/motif/motif-2.3.8-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools flag-o-matic multilib toolchain-funcs multilib-minimal
@@ -28,15 +28,15 @@ RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
)"
-DEPEND="${RDEPEND}
- sys-devel/flex
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/flex
|| ( sys-devel/bison dev-util/byacc sys-freebsd/freebsd-ubin )
x11-base/xorg-proto
x11-misc/xbitmaps"
src_prepare() {
eapply ../patch
- eapply_user
+ default
# disable compilation of demo binaries
sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am