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
Conversation
Copyright policy changePlease 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 assignmentSubmitter: @mm1ke dev-libs/bglibs: @robbat2 Linked bugsBugs linked: 380649 In order to force reassignment and/or bug reference scan, please append Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide |
|
||
dodoc ANNOUNCEMENT NEWS README ChangeLog TODO VERSION | ||
docinto html | ||
dodoc doc/html/* |
There was a problem hiding this comment.
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/* |
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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) |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
relative symlink pls
@SoapGentoo |
@SoapGentoo |
@steils Can you eyeball and check this for updates? |
There was a problem hiding this 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.
docinto html | ||
dodoc -r doc/html/. | ||
docinto latex | ||
dodoc -r doc/latex/. |
There was a problem hiding this comment.
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
).
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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" |
There was a problem hiding this comment.
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
?
There was a problem hiding this comment.
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
Ping, any chance we can merge this? |
Pull request CI reportReport generated at: 2019-05-11 16:00 UTC Issues already there before the PR (double-check them): |
@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. |
@steils sorry, not really. I also don't use it actually. Only bumped it to get rid of EAPI2 ebuilds. |
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 #380649Signed-off-by: Michael Mair-Keimberger m.mairkeimberger@gmail.com