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-libs/bglibs: EAPI7, update ebuild #11794

Closed
wants to merge 1 commit into from
Closed

Conversation

mm1ke
Copy link
Contributor

@mm1ke mm1ke commented Apr 22, 2019

Hi,

This PR updates bglibs for EAPI7, adds some missing die and removes the usage of dohtml.
Please review.
Also added sys-devel/libtool dependency in order to close bug #380649

Signed-off-by: Michael Mair-Keimberger m.mairkeimberger@gmail.com

@gentoo-bot gentoo-bot added assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. labels Apr 22, 2019
@mm1ke mm1ke changed the title dev-libs/bglibs: EAPI7, update ebuild [please reassign] dev-libs/bglibs: EAPI7, update ebuild Apr 22, 2019
@gentoo-bot gentoo-bot changed the title [please reassign] dev-libs/bglibs: EAPI7, update ebuild dev-libs/bglibs: EAPI7, update ebuild Apr 22, 2019
@gentoo-bot
Copy link

Copyright policy change

Please note that on 2018-09-15 Trustees have approved new Gentoo copyright policy. All contributions made to Gentoo need to follow this policy. If you include the Signed-off-by line in your commit message, you indicate that you have read the policy and agree to its terms. For more detailed explanation, please see the new Gentoo copyright policy explained article.

Pull Request assignment

Submitter: @mm1ke
Areas affected: ebuilds
Packages affected: dev-libs/bglibs

dev-libs/bglibs: @robbat2

Linked bugs

Bugs linked: 380649


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. and removed assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. labels Apr 22, 2019

dodoc ANNOUNCEMENT NEWS README ChangeLog TODO VERSION
docinto html
dodoc doc/html/*
Copy link
Member

Choose a reason for hiding this comment

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

dodoc -r doc/html/. (avoid globbing)

docinto html
dodoc doc/html/*
docinto latex
dodoc doc/latex/*
Copy link
Member

Choose a reason for hiding this comment

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

ditto

dosym ../libbg-sysdeps.so.1.1.1 /usr/$(get_libdir)/bglibs/libbg-sysdeps.so.1.1.1

rm "${D}"/usr/$(get_libdir)/bglibs/libbg.la || die
rm "${D}"/usr/$(get_libdir)/bglibs/libbg-sysdeps.la || die
Copy link
Member

Choose a reason for hiding this comment

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

${ED} instead of ${D}


#install .so in LDPATH
mv "${D}"/usr/$(get_libdir)/bglibs/libbg.so.1.1.1 "${D}"/usr/$(get_libdir)/ || die
mv "${D}"/usr/$(get_libdir)/bglibs/libbg-sysdeps.so.1.1.1 "${D}"/usr/$(get_libdir)/ || die
Copy link
Member

Choose a reason for hiding this comment

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

${ED}


#make backwards compatible symlinks
dosym /usr/$(get_libdir)/bglibs /usr/$(get_libdir)/bglibs/lib
[ "$(get_libdir)" != "lib" ] && dosym /usr/$(get_libdir)/bglibs /usr/$(get_libdir)/bglibs/$(get_libdir)
Copy link
Member

Choose a reason for hiding this comment

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

[[ $(get_libdir) != lib ]] && ...
The double brackets are safer and recommended in the Handbook

Copy link
Member

Choose a reason for hiding this comment

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

Also, can you try and make the symlink relative?

"${S}"/Makefile || die
sed -i \
-e '/selftests/d' \
"${S}"/TARGETS || die
Copy link
Member

Choose a reason for hiding this comment

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

drop the "${S}"/

@@ -0,0 +1,80 @@
# Copyright 1999-2019 Gentoo Authors
Copy link
Member

Choose a reason for hiding this comment

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

Thanks @mm1ke , this package sorely needed it. Instead of bumping the current version, could you try adding the latest upstream version instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hmm, i can do it on my todo list. I saw there is a newer version of that package, but to be honest i don't use any of it's customers so i didn't bother looking further into it..

}

src_compile() {
echo "${D}/usr/bin" > conf-bin || die
Copy link
Member

Choose a reason for hiding this comment

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

${ED}?

#make backwards compatible symlinks
dosym /usr/$(get_libdir)/bglibs /usr/$(get_libdir)/bglibs/lib
[ "$(get_libdir)" != "lib" ] && dosym /usr/$(get_libdir)/bglibs /usr/$(get_libdir)/bglibs/$(get_libdir)
dosym /usr/include/bglibs /usr/$(get_libdir)/bglibs/include
Copy link
Member

Choose a reason for hiding this comment

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

relative symlink pls

@mm1ke
Copy link
Contributor Author

mm1ke commented Apr 23, 2019

@SoapGentoo
I hope i didn't miss anything :) The package still builds fine at least.

@mm1ke
Copy link
Contributor Author

mm1ke commented May 5, 2019

@SoapGentoo
I've rebased this PR. A version bump was added in the meanwhile. Don't know if my PR is still needed, but since it's a major(?) version bump, it might be good to keep the older one too? (and thus bump it to EAPI7)

@robbat2
Copy link
Contributor

robbat2 commented May 6, 2019

@steils Can you eyeball and check this for updates?

Copy link
Member

@steils steils left a comment

Choose a reason for hiding this comment

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

Thanks Michael. I think this PR is still needed, as bglibs-2.04 is masked for a little while.

dev-libs/bglibs/bglibs-1.106-r2.ebuild Outdated Show resolved Hide resolved
dev-libs/bglibs/bglibs-1.106-r2.ebuild Show resolved Hide resolved
docinto html
dodoc -r doc/html/.
docinto latex
dodoc -r doc/latex/.
Copy link
Member

Choose a reason for hiding this comment

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

Installing *.tex files looks strange for me. I would suggest to compile a pdf and install it when USE=doc is enabled (e.g. like in bglibs-2.04.ebuild).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changed this too..
Again, basically took over from the bglibs-2.04.ebuild

rm "${ED}"/usr/$(get_libdir)/bglibs/libbg-sysdeps.la || die

dodoc ANNOUNCEMENT NEWS README ChangeLog TODO VERSION
docinto html
Copy link
Member

Choose a reason for hiding this comment

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

A nitpicking: now refman.pdf is installed to doc/html/ :)
(You do not need docinto html here, just:

	dodoc -r doc/html/
	if use doc; then
		dodoc doc/latex/refman.pdf
	fi

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're right, nice catch.. fixed :)

KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="doc"

DEPEND="sys-devel/libtool"
Copy link
Member

Choose a reason for hiding this comment

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

Are you sure this is DEPEND, not BDEPEND?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're right again, I've put it into BDEPEND

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Closes: https://bugs.gentoo.org/380649
@mm1ke
Copy link
Contributor Author

mm1ke commented May 11, 2019

Ping, any chance we can merge this?

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2019-05-11 16:00 UTC
Newest commit scanned: 4983732
Status: ✅ good

Issues already there before the PR (double-check them):
https://qa-reports.gentoo.org/output/gentoo-ci/9711084/output.html#media-libs/mesa

@steils
Copy link
Member

steils commented May 17, 2019

@mm1ke Maybe you would like to proxy-maintain bglibs (and any of its revdeps)? robbat2 says he doesn't use them and doesn't want to maintain them anymore.

@mm1ke
Copy link
Contributor Author

mm1ke commented May 18, 2019

@steils sorry, not really. I also don't use it actually. Only bumped it to get rid of EAPI2 ebuilds.

@mm1ke mm1ke deleted the bgli-k2e3N3OQ branch September 22, 2019 18:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR.
Projects
None yet
6 participants