diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-02 10:47:13 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-02 10:47:13 +0100 |
commit | 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec (patch) | |
tree | 401ffbc2ade49ce18f6182969ec5fb697a57ce48 /x11-wm/openbox/openbox-9999.ebuild | |
parent | d4bd6695641f6d2ec7ff8681913d304e995902f5 (diff) |
gentoo resync : 02.06.2018
Diffstat (limited to 'x11-wm/openbox/openbox-9999.ebuild')
-rw-r--r-- | x11-wm/openbox/openbox-9999.ebuild | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/x11-wm/openbox/openbox-9999.ebuild b/x11-wm/openbox/openbox-9999.ebuild index a2cb088ec10b..fd29dcff8e5e 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 @@ -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="" - else SRC_URI="http://openbox.org/dist/openbox/${P}.tar.gz branding? ( https://dev.gentoo.org/~hwoarang/distfiles/surreal-gentoo.tar.gz )" @@ -29,6 +27,10 @@ REQUIRED_USE="xdg? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="dev-libs/glib:2 >=dev-libs/libxml2-2.0 >=media-libs/fontconfig-2 + x11-libs/cairo + x11-libs/libXau + x11-libs/libXcursor + x11-libs/libXext x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr @@ -47,21 +49,14 @@ DEPEND="${RDEPEND} virtual/pkgconfig x11-base/xorg-proto" -src_unpack() { - if [[ ${PV} == *9999* ]]; then - git-2_src_unpack - else - unpack ${A} - fi -} +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 } |