[gentoo-commits] repo/gentoo:master commit in: x11-wm/openbox/

[Johannes Huber]

commit:     4d59f9f210fb49183354b0c1453c0a9c2d38d32e
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed May 30 21:07:13 2018 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed May 30 21:13:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d59f9f2

x11-wm/openbox: EAPI 6

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../openbox/{openbox-9999.ebuild => openbox-3.6.1-r1.ebuild}  | 11 +++++------
 x11-wm/openbox/openbox-9999.ebuild                            |  9 ++++-----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/x11-wm/openbox/openbox-9999.ebuild 
b/x11-wm/openbox/openbox-3.6.1-r1.ebuild
similarity index 93%
copy from x11-wm/openbox/openbox-9999.ebuild
copy to x11-wm/openbox/openbox-3.6.1-r1.ebuild
index 1a98e9183a6..0c6773cef0a 100644
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 inherit multilib autotools python-r1 eutils
@@ -13,12 +13,10 @@ if [[ ${PV} == *9999* ]]; then
        EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
        SRC_URI="branding? (
        https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-       KEYWORDS=""
-
 else
        SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
        branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-       KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~arm-linux ~x86-linux"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~arm-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2"
@@ -51,14 +49,15 @@ DEPEND="${RDEPEND}
        virtual/pkgconfig
        x11-base/xorg-proto"
 
+PATCHES=( "${FILESDIR}/${PN}-3.5.2-gnome-session.patch" )
+
 src_prepare() {
        use xdg && python_export_best
-       epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch
+       default
        sed -i \
                -e "s:-O0 -ggdb ::" \
                -e 's/-fno-strict-aliasing//' \
                "${S}"/m4/openbox.m4 || die
-       epatch_user
        eautoreconf
 }
 

diff --git a/x11-wm/openbox/openbox-9999.ebuild 
b/x11-wm/openbox/openbox-9999.ebuild
index 1a98e9183a6..f38bbd65197 100644
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 inherit multilib autotools python-r1 eutils
@@ -13,8 +13,6 @@ if [[ ${PV} == *9999* ]]; then
        EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
        SRC_URI="branding? (
        https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-       KEYWORDS=""
-
 else
        SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz
        branding? ( 
https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
@@ -51,14 +49,15 @@ DEPEND="${RDEPEND}
        virtual/pkgconfig
        x11-base/xorg-proto"
 
+PATCHES=( "${FILESDIR}/${PN}-3.5.2-gnome-session.patch" )
+
 src_prepare() {
        use xdg && python_export_best
-       epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch
+       default
        sed -i \
                -e "s:-O0 -ggdb ::" \
                -e 's/-fno-strict-aliasing//' \
                "${S}"/m4/openbox.m4 || die
-       epatch_user
        eautoreconf
 }