[gentoo-commits] repo/gentoo:master commit in: www-client/surf/

[Jeroen Roovers]

commit:     8409d3195a71a22be4dae5cf0a661a9facb24d97
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 15:16:51 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 15:17:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8409d319

www-client/surf: EAPI 6.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../surf/{surf-9999.ebuild => surf-0.7-r1.ebuild}  | 26 ++++++++++++++++------
 www-client/surf/surf-9999.ebuild                   | 15 ++++++++-----
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/www-client/surf/surf-9999.ebuild 
b/www-client/surf/surf-0.7-r1.ebuild
similarity index 67%
copy from www-client/surf/surf-9999.ebuild
copy to www-client/surf/surf-0.7-r1.ebuild
index cf2697d9a9..ea3c9d8472 100644
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-0.7-r1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit eutils git-2 savedconfig toolchain-funcs
+EAPI=6
+inherit savedconfig toolchain-funcs
 
 DESCRIPTION="a simple web browser based on WebKit/GTK+"
 HOMEPAGE="http://surf.suckless.org/";
-EGIT_REPO_URI="git://git.suckless.org/surf"
+SRC_URI="http://dl.suckless.org/${PN}/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND="
        dev-libs/glib:2
@@ -34,6 +34,9 @@ RDEPEND="
                x11-terms/st
        )
 "
+PATCHES=(
+       "${FILESDIR}"/${PN}-0.7-gentoo.patch
+)
 
 pkg_setup() {
        if ! use savedconfig; then
@@ -49,13 +52,22 @@ pkg_setup() {
 }
 
 src_prepare() {
-       epatch "${FILESDIR}"/${P}-gentoo.patch
-       epatch_user
+       default
+
        restore_config config.h
+
        tc-export CC PKG_CONFIG
 }
 
 src_install() {
        default
+
        save_config config.h
 }
+
+pkg_postinst() {
+       if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 0.4.1-r1 
]]; then
+               ewarn "Please correct the permissions of your \$HOME/.surf/ 
directory"
+               ewarn "and its contents to no longer be world readable (see bug 
#404983)"
+       fi
+}

diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
index cf2697d9a9..e685de4fba 100644
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-inherit eutils git-2 savedconfig toolchain-funcs
+EAPI=6
+inherit git-r3 savedconfig toolchain-funcs
 
 DESCRIPTION="a simple web browser based on WebKit/GTK+"
 HOMEPAGE="http://surf.suckless.org/";
@@ -34,6 +34,9 @@ RDEPEND="
                x11-terms/st
        )
 "
+PATCHES=(
+       "${FILESDIR}"/${P}-gentoo.patch
+)
 
 pkg_setup() {
        if ! use savedconfig; then
@@ -49,13 +52,15 @@ pkg_setup() {
 }
 
 src_prepare() {
-       epatch "${FILESDIR}"/${P}-gentoo.patch
-       epatch_user
+       default
+
        restore_config config.h
+
        tc-export CC PKG_CONFIG
 }
 
 src_install() {
        default
+
        save_config config.h
 }