From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/yasm/
Date: Tue, 18 Aug 2020 14:53:23 +0000 (UTC) [thread overview]
Message-ID: <1597762372.0be5422b1aa70798c1856edb9b3a62ca5dda2b07.floppym@gentoo> (raw)
commit: 0be5422b1aa70798c1856edb9b3a62ca5dda2b07
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 14:48:03 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 14:52:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0be5422b
dev-lang/yasm: drop python support
Bug: https://bugs.gentoo.org/702364
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../{yasm-9999.ebuild => yasm-1.3.0-r1.ebuild} | 30 +++++++---------------
dev-lang/yasm/yasm-9999.ebuild | 30 +++++++---------------
2 files changed, 18 insertions(+), 42 deletions(-)
diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-1.3.0-r1.ebuild
similarity index 59%
copy from dev-lang/yasm/yasm-9999.ebuild
copy to dev-lang/yasm/yasm-1.3.0-r1.ebuild
index ccd86bc0090..ffd88e2bc66 100644
--- a/dev-lang/yasm/yasm-9999.ebuild
+++ b/dev-lang/yasm/yasm-1.3.0-r1.ebuild
@@ -2,16 +2,15 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 toolchain-funcs
+inherit toolchain-funcs
if [[ ${PV} == 9999* ]] ; then
EGIT_REPO_URI="https://github.com/yasm/yasm.git"
inherit autotools git-r3
else
SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz"
- KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="An assembler for x86 and x86_64 instruction sets"
@@ -19,52 +18,41 @@ HOMEPAGE="http://yasm.tortall.net/"
LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )"
SLOT="0"
-IUSE="nls python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="nls"
BDEPEND="
nls? ( sys-devel/gettext )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '>=dev-python/cython-0.14[${PYTHON_USEDEP}]')
- )
"
DEPEND="
nls? ( virtual/libintl )
"
RDEPEND="${DEPEND}
- python? ( ${PYTHON_DEPS} )
"
if [[ ${PV} == 9999* ]]; then
BDEPEND+="
app-text/xmlto
app-text/docbook-xml-dtd:4.1.2
+ dev-lang/python
"
fi
-pkg_setup() {
- : # Avoid python-single-r1_pkg_setup
-}
-
src_prepare() {
default
if [[ ${PV} == 9999* ]]; then
eautoreconf
- ./modules/arch/x86/gen_x86_insn.py || die
+ python modules/arch/x86/gen_x86_insn.py || die
fi
}
src_configure() {
- use python && python_setup
-
local myconf=(
- CC_FOR_BUILD=$(tc-getBUILD_CC) \
- CCLD_FOR_BUILD=$(tc-getBUILD_CC) \
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+ CCLD_FOR_BUILD="$(tc-getBUILD_CC)"
--disable-warnerror
- $(use_enable python)
- $(use_enable python python-bindings)
+ --disable-python
+ --disable-python-bindings
$(use_enable nls)
)
diff --git a/dev-lang/yasm/yasm-9999.ebuild b/dev-lang/yasm/yasm-9999.ebuild
index ccd86bc0090..ffd88e2bc66 100644
--- a/dev-lang/yasm/yasm-9999.ebuild
+++ b/dev-lang/yasm/yasm-9999.ebuild
@@ -2,16 +2,15 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python2_7 )
-inherit python-single-r1 toolchain-funcs
+inherit toolchain-funcs
if [[ ${PV} == 9999* ]] ; then
EGIT_REPO_URI="https://github.com/yasm/yasm.git"
inherit autotools git-r3
else
SRC_URI="http://www.tortall.net/projects/yasm/releases/${P}.tar.gz"
- KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="An assembler for x86 and x86_64 instruction sets"
@@ -19,52 +18,41 @@ HOMEPAGE="http://yasm.tortall.net/"
LICENSE="BSD-2 BSD || ( Artistic GPL-2 LGPL-2 )"
SLOT="0"
-IUSE="nls python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="nls"
BDEPEND="
nls? ( sys-devel/gettext )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '>=dev-python/cython-0.14[${PYTHON_USEDEP}]')
- )
"
DEPEND="
nls? ( virtual/libintl )
"
RDEPEND="${DEPEND}
- python? ( ${PYTHON_DEPS} )
"
if [[ ${PV} == 9999* ]]; then
BDEPEND+="
app-text/xmlto
app-text/docbook-xml-dtd:4.1.2
+ dev-lang/python
"
fi
-pkg_setup() {
- : # Avoid python-single-r1_pkg_setup
-}
-
src_prepare() {
default
if [[ ${PV} == 9999* ]]; then
eautoreconf
- ./modules/arch/x86/gen_x86_insn.py || die
+ python modules/arch/x86/gen_x86_insn.py || die
fi
}
src_configure() {
- use python && python_setup
-
local myconf=(
- CC_FOR_BUILD=$(tc-getBUILD_CC) \
- CCLD_FOR_BUILD=$(tc-getBUILD_CC) \
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+ CCLD_FOR_BUILD="$(tc-getBUILD_CC)"
--disable-warnerror
- $(use_enable python)
- $(use_enable python python-bindings)
+ --disable-python
+ --disable-python-bindings
$(use_enable nls)
)
next reply other threads:[~2020-08-18 14:53 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-18 14:53 Mike Gilbert [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-09 5:20 [gentoo-commits] repo/gentoo:master commit in: dev-lang/yasm/ Sam James
2023-12-12 18:38 Mike Frysinger
2023-12-12 18:32 Mike Frysinger
2020-09-23 11:07 Michał Górny
2020-09-23 11:07 Michał Górny
2020-09-23 11:07 Michał Górny
2020-09-23 10:20 Agostino Sarubbo
2020-09-20 21:52 Thomas Deutschmann
2020-08-25 14:54 Mike Gilbert
2020-06-13 14:58 Mike Gilbert
2020-05-13 23:11 Mike Gilbert
2020-04-24 17:14 Mike Gilbert
2020-04-24 16:53 Mike Gilbert
2020-04-24 16:53 Mike Gilbert
2019-11-29 8:17 Michał Górny
2017-12-25 19:17 David Seifert
2017-07-30 8:47 Michał Górny
2017-03-20 20:34 Fabian Groffen
2016-12-07 8:32 Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1597762372.0be5422b1aa70798c1856edb9b3a62ca5dda2b07.floppym@gentoo \
--to=floppym@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox