net-p2p/gridcoin: r1 with a few fixes and cleanups.

Most notably: daemon and gui can no longer be installed at the same time.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Sven Eden <sven.eden@prydeworx.com>

1 files changed, 33 insertions, 30 deletions

diff --git a/net-p2p/gridcoin/gridcoin-5.3.3.0.ebuild b/net-p2p/gridcoin/gridcoin-5.3.3.0-r1.ebuild
index 19581f8..58afd18 100644
--- a/net-p2p/gridcoin/gridcoin-5.3.3.0.ebuild
+++ b/net-p2p/gridcoin/gridcoin-5.3.3.0-r1.ebuild
@@ -18,24 +18,31 @@ IUSE_DAEMON="daemon"
 IUSE_OPTIONAL="bench +boinc ccache debug +harden libraries pic qrcode static test upnp utils systemd"
 IUSE="${IUSE_GUI} ${IUSE_DAEMON} ${IUSE_OPTIONAL}"
 
+# Note: The client *CAN* *NOT* connect to the daemon like the BOINc client does.
+#       Therefore either run the daemon or the gui client. Furthermore starting the gui client while
+#       the daemon is running will kill the latter.
+#  See: https://www.reddit.com/r/gridcoin/comments/9x0zsy/comment/e9r85vf/
+#       "The GUI instance will not rpc to another wallet process."
 REQUIRED_USE="
-	|| ( daemon qt5 )
+	^^ ( daemon qt5 )
 	dbus? ( qt5 )
 	qrcode? ( qt5 )
 "
 
 RDEPEND="
-	acct-group/gridcoin
-	acct-user/gridcoin[boinc=]
-	>=dev-libs/boost-1.60
-	>=dev-libs/openssl-1.1.1l:=
-	>=dev-libs/libzip-1.3.0
 	>=dev-libs/libevent-2.1.12
+	daemon? (
+		acct-group/gridcoin
+		acct-user/gridcoin[boinc=]
+	)
+	dev-libs/boost
+	dev-libs/openssl:0/1.1
+	dev-libs/libzip
 	sys-libs/db:5.3[cxx]
 	dbus? ( dev-qt/qtdbus:5 )
 	qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtconcurrent:5 dev-qt/qtcharts:5 )
 	qrcode? ( media-gfx/qrencode )
-	upnp? ( >=net-libs/miniupnpc-1.9.20140401 )
+	upnp? ( net-libs/miniupnpc )
 	boinc? ( sci-misc/boinc )
 	utils? ( net-p2p/bitcoin-cli dev-util/bitcoin-tx )"
 DEPEND="${RDEPEND}
@@ -63,19 +70,20 @@ src_prepare() {
 src_configure() {
 	use harden && append-flags -Wa,--noexecstack
 	econf \
+		$(use_enable bench) \
+		$(use_enable ccache ) \
+		$(use_enable debug) \
+		$(use_enable harden hardening) \
+		$(use_enable static) \
+		$(use_enable test tests)
 		$(use_with daemon) \
 		$(use_with dbus qtdbus) \
-		$(use_with qt5 gui qt5) \
+		$(use_with libraries libs) \
+		$(use_with pic) \
 		$(use_with qrcode qrencode) \
+		$(use_with qt5 gui qt5) \
 		$(use_with upnp miniupnpc) \
-		$(use_with pic) \
-		$(use_with libraries libs) \
-		$(use_with utils) \
-		$(use_enable harden hardening) \
-		$(use_enable bench) \
-		$(use_enable static) \
-		$(use_enable debug) \
-		$(use_enable test tests)
+		$(use_with utils)
 }
 
 src_install() {
@@ -86,6 +94,12 @@ src_install() {
 		if use systemd ; then
 			systemd_dounit "${FILESDIR}"/gridcoin.service
 		fi
+		diropts -o${PN} -g${PN}
+		keepdir /var/lib/${PN}/.GridcoinResearch/
+		newconfd "${FILESDIR}"/gridcoinresearch.conf gridcoinresearch
+		fowners gridcoin:gridcoin /etc/conf.d/gridcoinresearch
+		fperms 0660 /etc/conf.d/gridcoinresearch
+		dosym ../../../../etc/conf.d/gridcoinresearch /var/lib/${PN}/.GridcoinResearch/gridcoinresearch.conf
 	fi
 	if use qt5 ; then
 		newbin src/qt/gridcoinresearch gridcoinresearch
@@ -98,30 +112,19 @@ src_install() {
 	fi
 	dodoc README.md CHANGELOG.md doc/build-unix.md
 
-	diropts -o${PN} -g${PN}
-	keepdir /var/lib/${PN}/.GridcoinResearch/
-	newconfd "${FILESDIR}"/gridcoinresearch.conf gridcoinresearch
-	fowners gridcoin:gridcoin /etc/conf.d/gridcoinresearch
-	fperms 0660 /etc/conf.d/gridcoinresearch
-	dosym ../../../../../etc/conf.d/gridcoinresearch /var/lib/${PN}/.GridcoinResearch/gridcoinresearch.conf
 }
 
 pkg_postinst() {
 	elog
 	elog "You are using a source compiled version of gridcoin."
-	elog "The daemon can be found at /usr/bin/gridcoinresearchd"
+	use daemon && elog "The daemon can be found at /usr/bin/gridcoinresearchd"
 	use qt5 && elog "The graphical wallet can be found at /usr/bin/gridcoinresearch"
 	elog
 	elog "You need to configure this node with a few basic details to do anything"
 	elog "useful with gridcoin. The wallet configuration file is located at:"
-	elog "    /etc/conf.d/gridcoinresearch"
+	use daemon && elog "    /etc/conf.d/gridcoinresearch"
+	use qt5 && elog "    \$HOME/.GridcoinResearch"
 	elog "The wiki for this configuration file is located at:"
 	elog "    http://wiki.gridcoin.us/Gridcoinresearch_config_file"
 	elog
-	if use boinc ; then
-		elog "To run your wallet as a researcher you should add gridcoin user to boinc group."
-		elog "Run as root:"
-		elog "gpasswd -a gridcoin boinc"
-		elog
-	fi
 }