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.

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

dev-lang/nasm: bump to 2.13.01, EAPI=6, fix doc dependencies #4938

Closed
wants to merge 2 commits into from

Conversation

sbraz
Copy link
Member

@sbraz sbraz commented Jun 15, 2017

Related bug: https://bugs.gentoo.org/show_bug.cgi?id=619360
I added some missing dependencies and removed texinfo which isn't required.
I will make a rekeywording bug for the arches that do not have the new deps once this is merged.

--- nasm-2.12.01.ebuild	2017-03-21 23:37:52.370951461 +0100
+++ nasm-2.13.01.ebuild	2017-06-15 22:10:12.276993250 +0200
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit flag-o-matic
 
 DESCRIPTION="groovy little assembler"
@@ -10,14 +10,22 @@
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc"
 
-DEPEND="dev-lang/perl
-	doc? ( app-text/ghostscript-gpl sys-apps/texinfo )"
-RDEPEND=""
+DEPEND="
+	dev-lang/perl
+	doc? (
+		app-text/ghostscript-gpl
+		dev-perl/Font-TTF
+		dev-perl/Sort-Versions
+		media-fonts/clearsans
+		virtual/perl-File-Spec
+	)
+"
 
 S=${WORKDIR}/${P/_}
+DOCS=( AUTHORS CHANGES ChangeLog README TODO )
 
 src_configure() {
 	strip-flags
@@ -25,17 +33,15 @@
 }
 
 src_compile() {
-	emake nasmlib.o
-	emake all
+	default
 	use doc && emake doc
 }
 
 src_install() {
 	emake INSTALLROOT="${D}" install install_rdf
-	dodoc AUTHORS CHANGES ChangeLog README TODO
-	if use doc ; then
-		doinfo doc/info/*
-		dohtml doc/html/*
-		dodoc doc/nasmdoc.*
+	if use doc; then
+		DOCS+=( doc/nasmdoc.{pdf,txt} )
+		HTML_DOCS=( doc/html/. )
 	fi
+	einstalldocs
 }

Package-Manager: Portage-2.3.6, Repoman-2.3.2
@gentoo-repo-qa-bot gentoo-repo-qa-bot added the need assignment It was impossible to assign the PR correctly. Please assign it manually. label Jun 15, 2017
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull Request assignment

Areas affected: ebuilds
Packages affected: dev-lang/nasm

dev-lang/nasm: mr_bones_

At least one of the listed packages is maintained entirely by non-GitHub developers!

@@ -15,5 +15,6 @@ Pentium, P6, MMX, 3DNow!, SSE and SSE2 opcodes, and has macro capability.
</longdescription>
<upstream>
<remote-id type="sourceforge">nasm</remote-id>
<bugs-to>https://bugzilla.nasm.us/</bugs-to>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did you run xmllint on this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I blame vim! (I didn't see that the original had spaces and my vim config uses tabs for those files, which is Gentoo's default I guess).

"

S=${WORKDIR}/${P/_}
DOCS=( AUTHORS CHANGES ChangeLog README TODO )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all of these are part of the default set?

src_install() {
emake INSTALLROOT="${D}" install install_rdf
if use doc; then
DOCS+=( doc/nasmdoc.{pdf,txt} )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rather just do dodoc doc/nasmdoc.{pdf,txt} here and nix the prior DOCS definition

Gentoo-Bug: 619360
Package-Manager: Portage-2.3.6, Repoman-2.3.2
@gentoo-bot gentoo-bot closed this in b7a831e Jul 2, 2017
@sbraz sbraz deleted the nasm branch June 26, 2018 09:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
need assignment It was impossible to assign the PR correctly. Please assign it manually.
Projects
None yet
3 participants