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

sci-misc/boinc: Version bump, fixes Bug #492602 + Fix slotting #135

Closed
wants to merge 8 commits into from

Conversation

@marbre
Copy link

marbre commented May 31, 2015

In reaction to https://bugs.gentoo.org/show_bug.cgi?id=492602, I took a look into the ebuilds attached to the bug report. The bump is mainly based on the attached ebuilds.
Instead of depending on x11-libs/wxGTK:3.0[X,opengl,webkit], I rolled back to x11-libs/wxGTK:2.8[X,opengl]. Otherwise the dependencies are unfulfilled on ~sparc and ~ia64. Furthermore, I added use systemd && in front to the systemd_dounit call and fixed slotting (also for the older versions).
On my machine, I need to uncomment the WANT_AUTOMAKE="1.11" to get boinc compiled.

repoman moans about LIVEVCS.unmasked 1, which shouldn't be a problem since we explicitly fetch an EGIT_COMMIT. Anyway, maybe somebody is willing to put the source into it's dev space, as @jlec did for version 7.2.0.

marbre added 2 commits May 31, 2015
Package-Manager: portage-2.2.18
Package-Manager: portage-2.2.18
@mrueg

This comment has been minimized.

Copy link

mrueg commented May 31, 2015

You could use https://github.com/BOINC/boinc/releases instead of requiring git eclasses here. :)

@marbre

This comment has been minimized.

Copy link
Author

marbre commented May 31, 2015

@mrueg You're absolutely right. Didn't thought about it ;)
Fixed this and further readded the systemd useflag.

@mgorny

This comment has been minimized.

Copy link
Member

mgorny commented Jun 2, 2015

@jlec, want to look at it with sci eye?

@@ -23,7 +23,7 @@ RDEPEND="
!sci-misc/boinc-bin
!app-admin/quickswitch
>=app-misc/ca-certificates-20080809
dev-libs/openssl
dev-libs/openssl:*

This comment has been minimized.

Copy link
@mgorny

mgorny Jun 5, 2015

Member

Does boinc use openssl at build time? If so, it needs OpenSSL headers and :* is invalid then since other slots don't provide the headers.

This comment has been minimized.

Copy link
@marbre

marbre Jun 6, 2015

Author

A realy short look into the configure.ac showed that ssl and jpeg are checked at buildtime. Thus := would be the right here and for jpeg?

I think I misunderstood :*. The wiki syas that :* means that any slot is acceptable, and explicitly declares that changes in the slot or sub-slot can be ignored;. I thought that means that changes within the sub-slot can be ignored, which would be okay. Anyway, also if the slot is changed the package depending on it isn't recompiled, correct? Further := leads to recompiling of the package if openssl changes.
Please correct me if I am wrong again.

@@ -35,7 +35,7 @@ RDEPEND="
dev-db/sqlite:3
media-libs/freeglut
sys-libs/glibc:2.2
virtual/jpeg
virtual/jpeg:*

This comment has been minimized.

Copy link
@mgorny

mgorny Jun 5, 2015

Member

Ditto.


newinitd "${FILESDIR}"/${PN}.init ${PN}
newconfd "${FILESDIR}"/${PN}.conf ${PN}
use systemd && systemd_dounit "${FILESDIR}"/${PN}.service

This comment has been minimized.

Copy link
@mgorny

mgorny Jun 5, 2015

Member

This is incorrect. systemd units are installed unconditionally.

This comment has been minimized.

Copy link
@marbre

marbre Jun 6, 2015

Author

Done.

enewgroup ${PN}
# note this works only for first install so we have to
# elog user about the need of being in video group
if use cuda; then

This comment has been minimized.

Copy link
@mgorny

mgorny Jun 5, 2015

Member

I'd suggest rolling that into one enewuser call with groups set in separate variable.

This comment has been minimized.

Copy link
@marbre

marbre Jun 6, 2015

Author

Hope, that's okay(?).

}

pkg_postinst() {
echo

This comment has been minimized.

Copy link
@mgorny

mgorny Jun 5, 2015

Member

Don't mix echo & elog.

This comment has been minimized.

Copy link
@jlec

jlec Jun 6, 2015

Member

I would say, use "echo" for simple black lines and "elog/einfo" when the line has content.

This comment has been minimized.

Copy link
@marbre

marbre Jun 6, 2015

Author

Thus, no change required here?


pkg_postinst() {
echo
elog "You are using the source compiled version of ${PN}."

This comment has been minimized.

Copy link
@mgorny

mgorny Jun 5, 2015

Member

It'd be better to replace most of ${PN} with verbose boinc. It will make it easier to read this and to check line width.

This comment has been minimized.

Copy link
@marbre

marbre Jun 6, 2015

Author

Done.

marbre added 2 commits Jun 6, 2015
Package-Manager: portage-2.2.18
Package-Manager: portage-2.2.18
@@ -23,7 +23,7 @@ RDEPEND="
!sci-misc/boinc-bin
!app-admin/quickswitch
>=app-misc/ca-certificates-20080809
dev-libs/openssl
dev-libs/openssl:=

This comment has been minimized.

Copy link
@prometheanfire

prometheanfire Jul 13, 2015

Member

is there a reason you did not go with :* instead of :=?

This comment has been minimized.

Copy link
@graaff

graaff Jul 13, 2015

Member

Actually this should be "dev-libs/openssl:0". The other slot only exists for binary compatibility and should not be used for normal packages.

This comment has been minimized.

Copy link
@mgorny

mgorny Jul 13, 2015

Member

Actually dev-libs/openssl:0= to cover the next time SONAME changes.

This comment has been minimized.

Copy link
@marbre

marbre Jul 13, 2015

Author

@prometheanfire That was my first idea, but since @mgorny commented in the first line note ("Does boinc use openssl at build time? If so, it needs OpenSSL headers and :* is invalid then since other slots don't provide the headers.") I changed it to :=.
Anyway, now I changed it once again to :0=. I still need to get deeper into slotting..

@@ -35,7 +35,7 @@ RDEPEND="
dev-db/sqlite:3
media-libs/freeglut
sys-libs/glibc:2.2
virtual/jpeg
virtual/jpeg:=

This comment has been minimized.

Copy link
@mgorny

mgorny Jul 25, 2015

Member

You want :0= here as well. virtual/jpeg:62 is binary-only.

This comment has been minimized.

Copy link
@marbre

marbre Jul 29, 2015

Author

Done.

}

src_configure() {
local wxconf=""

This comment has been minimized.

Copy link
@mgorny

mgorny Jul 25, 2015

Member

Please use an array here so that we can support whitespace in paths properly. Not that it matters right here, but it's cleaner this way.

This comment has been minimized.

Copy link
@mgorny

mgorny Jul 25, 2015

Member

In fact, you could drop the whole wxconf thing and just append to myeconfargs.

This comment has been minimized.

Copy link
@marbre

marbre Jul 29, 2015

Author

Fixed for version 7.4.42.


AUTOTOOLS_AUTORECONF=true

inherit autotools-utils eutils flag-o-matic systemd user versionator wxwidgets

This comment has been minimized.

Copy link
@mgorny

mgorny Aug 4, 2015

Member

eutils seems unused here.

This comment has been minimized.

Copy link
@mgorny

mgorny Aug 4, 2015

Member

Sorry, I was wrong. I see newicon and make_desktop_entry now.

LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="X cuda static-libs systemd"

This comment has been minimized.

Copy link
@mgorny

mgorny Aug 4, 2015

Member

USE=systemd is unused.

if use X; then
WX_GTK_VER="2.8"
need-wxwidgets unicode
myeconfargs+=(--with-wx-config=${WX_CONFIG})

This comment has been minimized.

Copy link
@mgorny

mgorny Aug 4, 2015

Member

Missing quoting around path in WX_CONFIG.

src_install() {
autotools-utils_src_install

dodir /var/lib/${PN}/

This comment has been minimized.

Copy link
@mgorny

mgorny Aug 4, 2015

Member

dodir is redundant, keepdir creates the directory.

autotools-utils_src_install

dodir /var/lib/${PN}/
keepdir /var/lib/${PN}/

This comment has been minimized.

Copy link
@mgorny

mgorny Aug 4, 2015

Member

And the trailing slash is a bad idea here.

keepdir /var/lib/${PN}/

if use X; then
newicon "${S}"/packages/generic/sea/${PN}mgr.48x48.png ${PN}.png || die

This comment has been minimized.

Copy link
@mgorny

mgorny Aug 4, 2015

Member

die is unnecessary here (newicon dies on its own)


src_configure() {
# add gtk includes
use X && append-flags "$(pkg-config --cflags gtk+-2.0)"

This comment has been minimized.

Copy link
@mgorny

mgorny Aug 4, 2015

Member

This may be unnecessary judging by Makefile.am. Though they have a typo in there but I'll fix it.

@mgorny

This comment has been minimized.

Copy link
Member

mgorny commented Aug 4, 2015

That all was FYI, I'm going to fix those minor mistakes and commit it finally.

@mgorny

This comment has been minimized.

Copy link
Member

mgorny commented Aug 4, 2015

+*boinc-7.4.42 (04 Aug 2015)
+
+  04 Aug 2015; Michał Górny <mgorny@gentoo.org> +boinc-7.4.42.ebuild,
+  boinc-7.2.0-r1.ebuild, boinc-7.2.0.ebuild:
+  Version bump with minor fixes. https://github.com/gentoo/gentoo-portage-rsync-
+  mirror/pull/135 by marbre.
@mgorny mgorny closed this Aug 4, 2015
minaco2 pushed a commit to git-portage/git-portage that referenced this pull request Feb 28, 2016
…by marbre.

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants
You can’t perform that action at this time.