Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

*/*: port to EAPI 7, inherit xdg.eclass #18281

Closed
wants to merge 6 commits into from
Closed

*/*: port to EAPI 7, inherit xdg.eclass #18281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8e9f791
sci-calculators/wcalc: port to EAPI 7
jsmolic Nov 16, 2020
539bc71
sys-cluster/mpich2: disable static libs
jsmolic Nov 16, 2020
68958df
app-text/fbreader: inherit xdg.eclass
jsmolic Nov 16, 2020
ba6d02e
media-sound/lollypop: inherit xdg.eclass
jsmolic Nov 16, 2020
d72d399
dev-vcs/qgit: inherit xdg.eclass
jsmolic Nov 16, 2020
58aaa0d
dev-lang/maude: respect AR
jsmolic Nov 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app-text/fbreader/fbreader-0.99.4-r5.ebuild
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@

EAPI=7

inherit flag-o-matic qmake-utils
inherit flag-o-matic qmake-utils xdg

DESCRIPTION="E-Book Reader. Supports many e-book formats"
HOMEPAGE="https://www.fbreader.org/"
Expand Down
10 changes: 10 additions & 0 deletions dev-lang/maude/files/maude-2.7-AR.patch
View file
Open in desktop
@@ -0,0 +1,10 @@
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,7 @@ fi
#
AC_PROG_CC
AC_PROG_CXX
+AM_PROG_AR
if (test "$GXX" = yes) then
AC_MSG_CHECKING([g++ compiler version])
GXX_VERSION=`$CXX -dumpversion`
3 changes: 2 additions & 1 deletion dev-lang/maude/maude-2.7.ebuild
View file
Open in desktop
@@ -1,4 +1,4 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=6
Expand Down Expand Up @@ -31,6 +31,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.5.0-prll.patch"
"${FILESDIR}/${PN}-2.6-search-datadir.patch"
"${FILESDIR}/${PN}-2.7-bison-parse-param.patch"
"${FILESDIR}/${PN}-2.7-AR.patch"
)

src_prepare() {
Expand Down
2 changes: 1 addition & 1 deletion dev-vcs/qgit/qgit-2.9.ebuild
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@

EAPI=7

inherit cmake
inherit cmake xdg

DESCRIPTION="Qt GUI for git repositories"
HOMEPAGE="https://github.com/tibirna/qgit"
Expand Down
6 changes: 3 additions & 3 deletions media-sound/lollypop/lollypop-1.2.35.ebuild
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ EAPI=7

PYTHON_COMPAT=( python3_{7,8} )
PYTHON_REQ_USE="sqlite"
inherit python-single-r1 gnome2-utils meson xdg-utils
inherit python-single-r1 gnome2-utils meson xdg

DESCRIPTION="Modern music player for GNOME"
HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
Expand Down Expand Up @@ -61,11 +61,11 @@ src_install() {
pkg_postinst() {
gnome2_gconf_install
gnome2_schemas_update
xdg_desktop_database_update
xdg_pkg_postinst
}

pkg_postrm() {
gnome2_gconf_uninstall
gnome2_schemas_update
xdg_desktop_database_update
xdg_pkg_postrm
}
10 changes: 10 additions & 0 deletions sci-calculators/wcalc/files/wcalc-2.5-AR.patch
View file
Open in desktop
@@ -0,0 +1,10 @@
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,7 @@ AC_PROG_CC
AC_PROG_CC_C99
AC_PROG_RANLIB
AC_PROG_YACC
+AM_PROG_AR
AM_PROG_LEX
AS_IF([test "x$LEX" == x],
[AC_MSG_ERROR([A Lex/Flex program is required in order to compile wcalc.])],
13 changes: 10 additions & 3 deletions sci-calculators/wcalc/wcalc-2.5.ebuild
View file
Open in desktop
@@ -1,9 +1,9 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=6
EAPI=7

inherit eutils
inherit autotools desktop

DESCRIPTION="A flexible command-line scientific calculator"
HOMEPAGE="http://w-calc.sourceforge.net/"
Expand All @@ -20,6 +20,13 @@ RDEPEND="
readline? ( sys-libs/readline:0= )"
DEPEND="${RDEPEND}"

PATCHES=( "${FILESDIR}"/${P}-AR.patch )

src_prepare() {
default
eautoreconf
}

src_configure() {
econf $(use_with readline)
}
Expand Down
6 changes: 4 additions & 2 deletions sys-cluster/mpich2/mpich2-1.5.ebuild
View file
Open in desktop
@@ -1,4 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=5
Expand Down Expand Up @@ -51,7 +51,7 @@ src_prepare() {
}

src_configure() {
local c="--enable-shared"
local c="--enable-shared --disable-static"

# The configure statements can be somewhat confusing, as they
# don't all show up in the top level configure, however, they
Expand Down Expand Up @@ -109,4 +109,6 @@ src_install() {
if ! use doc; then
rm -rf "${D}"usr/share/doc/${PF}/www*
fi

find "${ED}" -name '*.la' -delete || die
}