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

[Johannes Huber]

commit:     8883893ecd11b82dc40aaa3a62dba56b272271d7
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed May 30 20:53:03 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=8883893e

x11-wm/openbox: Migrate to git-r3 eclass

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 x11-wm/openbox/openbox-3.6.1.ebuild | 12 +-----------
 x11-wm/openbox/openbox-9999.ebuild  | 11 ++---------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/x11-wm/openbox/openbox-3.6.1.ebuild b/x11-wm/openbox/openbox-3.6.1.ebuild
index 1786f2c2ccf..fb04b059624 100644
--- a/x11-wm/openbox/openbox-3.6.1.ebuild
+++ b/x11-wm/openbox/openbox-3.6.1.ebuild
@@ -9,12 +9,10 @@ inherit multilib autotools python-r1 eutils
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
 HOMEPAGE="http://openbox.org/"
 if [[ ${PV} == *9999* ]]; then
-	inherit git-2
+	inherit git-r3
 	EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 	SRC_URI="branding? (
 	https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
-	KEYWORDS="alpha arm hppa ppc ppc64 sparc x86"
-
 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,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-base/xorg-proto"
 
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
 src_prepare() {
 	use xdg && python_export_best
 	epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch

diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild
index 651ddc4d1e4..1a98e9183a6 100644
--- a/x11-wm/openbox/openbox-9999.ebuild
+++ b/x11-wm/openbox/openbox-9999.ebuild
@@ -9,7 +9,7 @@ inherit multilib autotools python-r1 eutils
 DESCRIPTION="A standards compliant, fast, light-weight, extensible window manager"
 HOMEPAGE="http://openbox.org/"
 if [[ ${PV} == *9999* ]]; then
-	inherit git-2
+	inherit git-r3
 	EGIT_REPO_URI="git://git.openbox.org/dana/openbox"
 	SRC_URI="branding? (
 	https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )"
@@ -51,19 +51,12 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	x11-base/xorg-proto"
 
-src_unpack() {
-	if [[ ${PV} == *9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
 src_prepare() {
 	use xdg && python_export_best
 	epatch "${FILESDIR}"/${PN}-3.5.2-gnome-session.patch
 	sed -i \
 		-e "s:-O0 -ggdb ::" \
+		-e 's/-fno-strict-aliasing//' \
 		"${S}"/m4/openbox.m4 || die
 	epatch_user
 	eautoreconf