public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andrew Ammerlaan" <andrewammerlaan@riseup.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: media-video/syncplay/files/, media-video/syncplay/
Date: Fri,  1 May 2020 09:59:34 +0000 (UTC)	[thread overview]
Message-ID: <1588271111.354aafc5909fe905326f890b6d35589dc0cc8129.andrewammerlaan@gentoo> (raw)

commit:     354aafc5909fe905326f890b6d35589dc0cc8129
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Thu Apr 30 18:25:11 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu Apr 30 18:25:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=354aafc5

media-video/syncplay: only install initd/confd if use server

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 media-video/syncplay/files/syncplay-server-init-conf |  2 +-
 media-video/syncplay/syncplay-1.6.4_p1.ebuild        | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/media-video/syncplay/files/syncplay-server-init-conf b/media-video/syncplay/files/syncplay-server-init-conf
index c07ef82..8c8e0e8 100644
--- a/media-video/syncplay/files/syncplay-server-init-conf
+++ b/media-video/syncplay/files/syncplay-server-init-conf
@@ -1,7 +1,7 @@
 # This is the file that syncplay service loads settings from, it does not affect the binary itself
 # See https://syncplay.pl/guide/server/ for a list of available flags and description
 
-#port="223"
+#port="8999"
 #isolate=False
 #password="yourpassword"
 #salt="RANDOMSALT"

diff --git a/media-video/syncplay/syncplay-1.6.4_p1.ebuild b/media-video/syncplay/syncplay-1.6.4_p1.ebuild
index 5e5fc87..3a46c75 100644
--- a/media-video/syncplay/syncplay-1.6.4_p1.ebuild
+++ b/media-video/syncplay/syncplay-1.6.4_p1.ebuild
@@ -36,13 +36,14 @@ S="${WORKDIR}/${PN}-${MYPV}"
 
 python_install() {
 	local MY_MAKEOPTS=( DESTDIR="${D}" PREFIX=/usr )
-	use client && \
+	if use client; then
 		emake "${MY_MAKEOPTS[@]}" install-client
-	use server && \
+	fi
+	if use server; then
 		emake "${MY_MAKEOPTS[@]}" install-server
-
-	newinitd "${FILESDIR}/${PN}-server-init" "${PN}"
-	newconfd "${FILESDIR}/${PN}-server-init-conf" "${PN}"
+		newinitd "${FILESDIR}/${PN}-server-init" "${PN}"
+		newconfd "${FILESDIR}/${PN}-server-init-conf" "${PN}"
+	fi
 }
 
 pkg_postinst() {


WARNING: multiple messages have this Message-ID (diff)
From: "Andrew Ammerlaan" <andrewammerlaan@riseup.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: media-video/syncplay/files/, media-video/syncplay/
Date: Thu, 30 Apr 2020 18:25:20 +0000 (UTC)	[thread overview]
Message-ID: <1588271111.354aafc5909fe905326f890b6d35589dc0cc8129.andrewammerlaan@gentoo> (raw)
Message-ID: <20200430182520.Qwue0Bd-hRoQEnZAsuJKomtYp9OZi5d0Qmx6RfvvO-4@z> (raw)

commit:     354aafc5909fe905326f890b6d35589dc0cc8129
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Thu Apr 30 18:25:11 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu Apr 30 18:25:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=354aafc5

media-video/syncplay: only install initd/confd if use server

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 media-video/syncplay/files/syncplay-server-init-conf |  2 +-
 media-video/syncplay/syncplay-1.6.4_p1.ebuild        | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/media-video/syncplay/files/syncplay-server-init-conf b/media-video/syncplay/files/syncplay-server-init-conf
index c07ef82..8c8e0e8 100644
--- a/media-video/syncplay/files/syncplay-server-init-conf
+++ b/media-video/syncplay/files/syncplay-server-init-conf
@@ -1,7 +1,7 @@
 # This is the file that syncplay service loads settings from, it does not affect the binary itself
 # See https://syncplay.pl/guide/server/ for a list of available flags and description
 
-#port="223"
+#port="8999"
 #isolate=False
 #password="yourpassword"
 #salt="RANDOMSALT"

diff --git a/media-video/syncplay/syncplay-1.6.4_p1.ebuild b/media-video/syncplay/syncplay-1.6.4_p1.ebuild
index 5e5fc87..3a46c75 100644
--- a/media-video/syncplay/syncplay-1.6.4_p1.ebuild
+++ b/media-video/syncplay/syncplay-1.6.4_p1.ebuild
@@ -36,13 +36,14 @@ S="${WORKDIR}/${PN}-${MYPV}"
 
 python_install() {
 	local MY_MAKEOPTS=( DESTDIR="${D}" PREFIX=/usr )
-	use client && \
+	if use client; then
 		emake "${MY_MAKEOPTS[@]}" install-client
-	use server && \
+	fi
+	if use server; then
 		emake "${MY_MAKEOPTS[@]}" install-server
-
-	newinitd "${FILESDIR}/${PN}-server-init" "${PN}"
-	newconfd "${FILESDIR}/${PN}-server-init-conf" "${PN}"
+		newinitd "${FILESDIR}/${PN}-server-init" "${PN}"
+		newconfd "${FILESDIR}/${PN}-server-init-conf" "${PN}"
+	fi
 }
 
 pkg_postinst() {


             reply	other threads:[~2020-05-01  9:59 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-01  9:59 Andrew Ammerlaan [this message]
2020-04-30 18:25 ` [gentoo-commits] repo/proj/guru:dev commit in: media-video/syncplay/files/, media-video/syncplay/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2020-05-01  9:59 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2024-05-15 17:00 Julien Roy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1588271111.354aafc5909fe905326f890b6d35589dc0cc8129.andrewammerlaan@gentoo \
    --to=andrewammerlaan@riseup.net \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox