public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2019-02-09  9:52 Andreas Sturmlechner
  0 siblings, 0 replies; 30+ messages in thread
From: Andreas Sturmlechner @ 2019-02-09  9:52 UTC (permalink / raw
  To: gentoo-commits

commit:     fdb8eef90e91fc126cf02896590827ae12f35c9e
Author:     John Einar Reitan <john.einar <AT> gmail <DOT> com>
AuthorDate: Thu Feb  7 12:22:42 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb  9 09:52:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdb8eef9

sys-power/apcupsd: Remove dead nls keyword

NLS support was removed from apcupsd in the 3.14.4 release, as stated in
the ReleaseNotes. The ebuild still have an IUSE for nls and a DEPEND on
sys-devel/gettext, for no reason. So this cleans up the ebuild.

Closes: https://bugs.gentoo.org/499770
Signed-off-by: John Einar Reitan <john.einar <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10999
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
index 6b1c1f839c9..237d66e517c 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd"
-IUSE="snmp +usb +modbus cgi nls gnome kernel_linux"
+IUSE="snmp +usb +modbus cgi gnome kernel_linux"
 
 DEPEND="
 	||	( >=sys-apps/util-linux-2.23[tty-helpers(-)]
@@ -20,7 +20,6 @@ DEPEND="
 		)
 	modbus? ( usb? ( virtual/libusb:0 ) )
 	cgi? ( >=media-libs/gd-1.8.4 )
-	nls? ( sys-devel/gettext )
 	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
 	gnome? ( >=x11-libs/gtk+-2.4.0:2
 		dev-libs/glib:2


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2023-06-28  7:55 Sam James
  0 siblings, 0 replies; 30+ messages in thread
From: Sam James @ 2023-06-28  7:55 UTC (permalink / raw
  To: gentoo-commits

commit:     83b281add451948e703d595d39995b4a5df8aff9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 07:51:52 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 07:55:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83b281ad

sys-power/apcupsd: add missing selinux policy dep

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
index a80e424729c5..a21985d7506a 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc ~riscv x86"
-IUSE="snmp +usb +modbus cgi"
+IUSE="selinux snmp +usb +modbus cgi"
 
 DEPEND=">=sys-apps/util-linux-2.23[tty-helpers(-)]
 	cgi? ( >=media-libs/gd-1.8.4 )
@@ -20,7 +20,8 @@ DEPEND=">=sys-apps/util-linux-2.23[tty-helpers(-)]
 	snmp? ( >=net-analyzer/net-snmp-5.7.2 )"
 
 RDEPEND="${DEPEND}
-	virtual/mailx"
+	virtual/mailx
+	selinux? ( sec-policy/selinux-apcupsd )"
 
 CONFIG_CHECK="~USB_HIDDEV ~HIDRAW"
 ERROR_USB_HIDDEV="CONFIG_USB_HIDDEV:	needed to access USB-attached UPSes"


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2023-04-03 17:40 Jakov Smolić
  0 siblings, 0 replies; 30+ messages in thread
From: Jakov Smolić @ 2023-04-03 17:40 UTC (permalink / raw
  To: gentoo-commits

commit:     2b813ca9ff02f10fdf1adc6a127aaf6f90213cbd
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  3 17:35:26 2023 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Mon Apr  3 17:38:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b813ca9

sys-power/apcupsd: Remove USE=gnome

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
index 39033efdfbe7..a80e424729c5 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,16 +12,11 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc ~riscv x86"
-IUSE="snmp +usb +modbus cgi gnome"
+IUSE="snmp +usb +modbus cgi"
 
 DEPEND=">=sys-apps/util-linux-2.23[tty-helpers(-)]
 	cgi? ( >=media-libs/gd-1.8.4 )
 	modbus? ( usb? ( virtual/libusb:0 ) )
-	gnome? (
-		>=x11-libs/gtk+-2.4.0:2
-		dev-libs/glib:2
-		>=gnome-base/gconf-2.0
-	)
 	snmp? ( >=net-analyzer/net-snmp-5.7.2 )"
 
 RDEPEND="${DEPEND}
@@ -75,7 +70,7 @@ src_configure() {
 		--enable-net --enable-pcnet \
 		--with-distname=gentoo \
 		$(use_enable snmp) \
-		$(use_enable gnome gapcmon) \
+		--disable-gapcmon \
 		${myconf} \
 		APCUPSD_MAIL=$(type -p mail)
 }


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2022-07-11 15:03 David Seifert
  0 siblings, 0 replies; 30+ messages in thread
From: David Seifert @ 2022-07-11 15:03 UTC (permalink / raw
  To: gentoo-commits

commit:     e293515b7bfa3f4d94c1a1587a3fde82f23f9377
Author:     John Einar Reitan <john.einar <AT> gmail <DOT> com>
AuthorDate: Mon Jul 11 15:03:36 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Jul 11 15:03:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e293515b

sys-power/apcupsd: Call udev_reload in pkg_postrm

Closes: https://github.com/gentoo/gentoo/pull/25929
Closes: https://bugs.gentoo.org/852641
Signed-off-by: John Einar Reitan <john.einar <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
index 7e9251a07001..39033efdfbe7 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
@@ -149,3 +149,7 @@ pkg_postinst() {
 		elog "in /dev/apcups/by-id directory."
 	fi
 }
+
+pkg_postrm() {
+	use kernel_linux && udev_reload
+}


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2022-01-04 10:30 David Seifert
  0 siblings, 0 replies; 30+ messages in thread
From: David Seifert @ 2022-01-04 10:30 UTC (permalink / raw
  To: gentoo-commits

commit:     c3457016c2fb9a94d7c168da9de1226b6666c836
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  4 10:30:02 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jan  4 10:30:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3457016

sys-power/apcupsd: remove implicit kernel_linux

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
index 492824ced834..d07f4d82209a 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ppc ~riscv x86"
-IUSE="snmp +usb +modbus cgi gnome kernel_linux"
+IUSE="snmp +usb +modbus cgi gnome"
 
 DEPEND=">=sys-apps/util-linux-2.23[tty-helpers(-)]
 	cgi? ( >=media-libs/gd-1.8.4 )


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2021-09-15  2:34 Sam James
  0 siblings, 0 replies; 30+ messages in thread
From: Sam James @ 2021-09-15  2:34 UTC (permalink / raw
  To: gentoo-commits

commit:     6d4a990748f8570b809cd41195b384ecc9082516
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 15 02:33:46 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 15 02:33:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d4a9907

sys-power/apcupsd: Keyword 3.14.14-r3 arm64, #809704

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
index 1f98fb5a8f7..a3e5b6e73c7 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 IUSE="snmp +usb +modbus cgi gnome kernel_linux"
 
 DEPEND=">=sys-apps/util-linux-2.23[tty-helpers(-)]


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2021-09-03  1:53 Sam James
  0 siblings, 0 replies; 30+ messages in thread
From: Sam James @ 2021-09-03  1:53 UTC (permalink / raw
  To: gentoo-commits

commit:     b0303890e9b763dc28080a5560de09b00448520f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  2 21:16:05 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep  2 23:52:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0303890

sys-power/apcupsd: [QA] fix UnusedInherits

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
index 091aa54ab76..1f98fb5a8f7 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit linux-info flag-o-matic systemd udev tmpfiles
+inherit linux-info systemd udev tmpfiles
 
 DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
 HOMEPAGE="http://www.apcupsd.org/"


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2021-05-13 21:17 Sam James
  0 siblings, 0 replies; 30+ messages in thread
From: Sam James @ 2021-05-13 21:17 UTC (permalink / raw
  To: gentoo-commits

commit:     d9d04de45e8abab63536dd698d65620489adbe39
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 21:17:04 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 13 21:17:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9d04de4

sys-power/apcupsd: Stabilize 3.14.14-r3 ppc, #789924

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
index 42eb9b6a110..091aa54ab76 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE="snmp +usb +modbus cgi gnome kernel_linux"
 
 DEPEND=">=sys-apps/util-linux-2.23[tty-helpers(-)]


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2021-05-13 18:56 Sam James
  0 siblings, 0 replies; 30+ messages in thread
From: Sam James @ 2021-05-13 18:56 UTC (permalink / raw
  To: gentoo-commits

commit:     5364687e75ecace52f6228a27d2b78f1d415efcf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 18:55:47 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 13 18:55:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5364687e

sys-power/apcupsd: Stabilize 3.14.14-r3 x86, #789924

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
index 4e128af7839..42eb9b6a110 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="snmp +usb +modbus cgi gnome kernel_linux"
 
 DEPEND=">=sys-apps/util-linux-2.23[tty-helpers(-)]


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2021-05-13 17:10 Sam James
  0 siblings, 0 replies; 30+ messages in thread
From: Sam James @ 2021-05-13 17:10 UTC (permalink / raw
  To: gentoo-commits

commit:     3797d466176d505184609c1796c6e7cddb3127be
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 17:10:47 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 13 17:10:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3797d466

sys-power/apcupsd: Stabilize 3.14.14-r3 amd64, #789924

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
index 12e0b16bcc7..4e128af7839 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~x86"
 IUSE="snmp +usb +modbus cgi gnome kernel_linux"
 
 DEPEND=">=sys-apps/util-linux-2.23[tty-helpers(-)]


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2021-04-01 22:23 Thomas Deutschmann
  0 siblings, 0 replies; 30+ messages in thread
From: Thomas Deutschmann @ 2021-04-01 22:23 UTC (permalink / raw
  To: gentoo-commits

commit:     277c84ca18d5b157cef1ce61977132086131400c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  1 22:23:19 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Apr  1 22:23:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=277c84ca

sys-power/apcupsd: drop old

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sys-power/apcupsd/Manifest               |   1 -
 sys-power/apcupsd/apcupsd-3.14.13.ebuild | 137 -------------------------------
 2 files changed, 138 deletions(-)

diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 147bf832e9b..7f3bbbf7365 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -1,2 +1 @@
-DIST apcupsd-3.14.13.tar.gz 1935043 BLAKE2B 56d8fb9c6a055b20c2d99867e43b6a2d6ebe1d55c724d8a6701d9baa569a14f600cb03c6176380c6c42c46ac610f43136a4b52c47c8b86bc41966d4091481e95 SHA512 74f7763de268626e24f9dd99090b01d5bff35c2fde769039104105ec27941673d1613c41fcac11e3d97d2fe5c364bcc0459847fcba5d2f7f1aac85795d6d8570
 DIST apcupsd-3.14.14.tar.gz 1843409 BLAKE2B 48a3b249780064d699d86b658584aa222ce9f3b46a81209110b4684bf737cca7492b87b063154864ce76478f29f73cda83ab96b47f4a7aa7aa91e29a8abbf4a8 SHA512 c953bbf3e08f809748a7978a3952604176390d1cd276f187fe096d9bc3c8993b52127e8350c0363387da41318e24b4d1e00ea58df71f3bb8f50c9a5a64cd2d7f

diff --git a/sys-power/apcupsd/apcupsd-3.14.13.ebuild b/sys-power/apcupsd/apcupsd-3.14.13.ebuild
deleted file mode 100644
index b3489084c86..00000000000
--- a/sys-power/apcupsd/apcupsd-3.14.13.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils linux-info flag-o-matic systemd udev tmpfiles
-
-DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
-HOMEPAGE="http://www.apcupsd.org/"
-SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-IUSE="snmp +usb cgi nls gnome kernel_linux"
-
-DEPEND="
-	>=sys-apps/util-linux-2.23[tty-helpers(-)]
-	cgi? ( >=media-libs/gd-1.8.4 )
-	nls? ( sys-devel/gettext )
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	gnome? ( >=x11-libs/gtk+-2.4.0:2
-		dev-libs/glib:2
-		>=gnome-base/gconf-2.0 )"
-RDEPEND="${DEPEND}
-	sys-apps/openrc
-	virtual/mailx"
-
-CONFIG_CHECK="~USB_HIDDEV ~HIDRAW"
-ERROR_USB_HIDDEV="CONFIG_USB_HIDDEV:	needed to access USB-attached UPSes"
-ERROR_HIDRAW="CONFIG_HIDRAW:		needed to access USB-attached UPSes"
-
-pkg_setup() {
-	if use kernel_linux && use usb && linux_config_exists; then
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.14.9-aliasing.patch"
-}
-
-src_configure() {
-	local myconf
-	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=/usr/libexec/${PN}/cgi-bin"
-	if use usb; then
-		myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --with-dev= "
-	else
-		myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --disable-usb"
-	fi
-
-	# We force the DISTNAME to gentoo so it will use gentoo's layout also
-	# when installed on non-linux systems.
-	econf \
-		--sbindir=/sbin \
-		--sysconfdir=/etc/apcupsd \
-		--with-pwrfail-dir=/etc/apcupsd \
-		--with-lock-dir=/run/apcupsd \
-		--with-pid-dir=/run/apcupsd \
-		--with-log-dir=/var/log \
-		--with-nis-port=3551 \
-		--enable-net --enable-pcnet \
-		--with-distname=gentoo \
-		$(use_enable snmp net-snmp) \
-		$(use_enable gnome gapcmon) \
-		${myconf} \
-		APCUPSD_MAIL=/bin/mail
-}
-
-src_compile() {
-	# Workaround for bug #280674; upstream should really just provide
-	# the text files in the distribution, but I wouldn't count on them
-	# doing that anytime soon.
-	MANPAGER=$(type -p cat) \
-		emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -f "${D}"/etc/init.d/halt
-
-	insinto /etc/apcupsd
-	newins examples/safe.apccontrol safe.apccontrol
-	doins "${FILESDIR}"/apcupsd.conf
-
-	dodoc ChangeLog* ReleaseNotes
-	doman doc/*.8 doc/*.5
-
-	dohtml -r doc/manual/*
-
-	rm "${D}"/etc/init.d/apcupsd
-	newinitd "${FILESDIR}/${PN}.init.4" "${PN}"
-	newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	dotmpfiles "${FILESDIR}"/${PN}-tmpfiles.conf
-
-	# remove hal settings, we don't really want to have it around still.
-	rm -r "${D}"/usr/share/hal
-
-	# replace it with our udev rules if we're in Linux
-	if use kernel_linux; then
-		udev_newrules "${FILESDIR}"/apcupsd-udev.rules 60-${PN}.rules
-	fi
-
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}-tmpfiles.conf
-
-	if use cgi; then
-		elog "The cgi-bin directory for ${PN} is /usr/libexec/${PN}/cgi-bin."
-		elog "Set up your ScriptAlias or symbolic links accordingly."
-	fi
-
-	elog ""
-	elog "Since version 3.14.0 you can use multiple apcupsd instances to"
-	elog "control more than one UPS in a single box with openRC."
-	elog "To do this, create a link between /etc/init.d/apcupsd to a new"
-	elog "/etc/init.d/apcupsd.something, and it will then load the"
-	elog "configuration file at /etc/apcupsd/something.conf."
-	elog ""
-
-	elog 'If you want apcupsd to power off your UPS when it'
-	elog 'shuts down your system in a power failure, you must'
-	elog 'add apcupsd.powerfail to your shutdown runlevel:'
-	elog ''
-	elog ' \e[01m rc-update add apcupsd.powerfail shutdown \e[0m'
-	elog ''
-
-	if use kernel_linux; then
-		elog "Starting from version 3.14.9-r1, ${PN} installs udev rules"
-		elog "for persistent device naming. If you have multiple UPS"
-		elog "connected to the machine, you can point them to the devices"
-		elog "in /dev/apcups/by-id directory."
-	fi
-}


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2021-03-07 16:45 David Seifert
  0 siblings, 0 replies; 30+ messages in thread
From: David Seifert @ 2021-03-07 16:45 UTC (permalink / raw
  To: gentoo-commits

commit:     4df23e9d7553956975e49bf7a47a0af833d03287
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  7 16:45:32 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Mar  7 16:45:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4df23e9d

sys-power/apcupsd: Call tmpfiles_process

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-power/apcupsd/apcupsd-3.14.13.ebuild    | 2 ++
 sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/sys-power/apcupsd/apcupsd-3.14.13.ebuild b/sys-power/apcupsd/apcupsd-3.14.13.ebuild
index 0b3e1741413..b3489084c86 100644
--- a/sys-power/apcupsd/apcupsd-3.14.13.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.13.ebuild
@@ -106,6 +106,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}-tmpfiles.conf
+
 	if use cgi; then
 		elog "The cgi-bin directory for ${PN} is /usr/libexec/${PN}/cgi-bin."
 		elog "Set up your ScriptAlias or symbolic links accordingly."

diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
index d3d3a89e00d..85882863d8e 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
@@ -106,6 +106,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}-tmpfiles.conf
+
 	if use cgi; then
 		elog "The cgi-bin directory for ${PN} is /usr/libexec/${PN}/cgi-bin."
 		elog "Set up your ScriptAlias or symbolic links accordingly."


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2021-03-07 11:58 David Seifert
  0 siblings, 0 replies; 30+ messages in thread
From: David Seifert @ 2021-03-07 11:58 UTC (permalink / raw
  To: gentoo-commits

commit:     273cddf01d7510523e0451c20d51a5e332ac5367
Author:     Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Sun Mar  7 11:57:52 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Mar  7 11:57:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=273cddf0

sys-power/apcupsd: migrate to tmpfiles.eclass

Closes: https://bugs.gentoo.org/740634
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans <AT> posteo.de>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-power/apcupsd/apcupsd-3.14.13.ebuild    | 6 +++---
 sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys-power/apcupsd/apcupsd-3.14.13.ebuild b/sys-power/apcupsd/apcupsd-3.14.13.ebuild
index b6e3eb60c4f..0b3e1741413 100644
--- a/sys-power/apcupsd/apcupsd-3.14.13.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils linux-info flag-o-matic systemd udev
+inherit eutils linux-info flag-o-matic systemd udev tmpfiles
 
 DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
 HOMEPAGE="http://www.apcupsd.org/"
@@ -93,7 +93,7 @@ src_install() {
 	newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail
 
 	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_dotmpfilesd "${FILESDIR}"/${PN}-tmpfiles.conf
+	dotmpfiles "${FILESDIR}"/${PN}-tmpfiles.conf
 
 	# remove hal settings, we don't really want to have it around still.
 	rm -r "${D}"/usr/share/hal

diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
index 4390e39bda5..d3d3a89e00d 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit linux-info flag-o-matic systemd udev
+inherit linux-info flag-o-matic systemd udev tmpfiles
 
 DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
 HOMEPAGE="http://www.apcupsd.org/"
@@ -93,7 +93,7 @@ src_install() {
 	newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail
 
 	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_dotmpfilesd "${FILESDIR}"/${PN}-tmpfiles.conf
+	dotmpfiles "${FILESDIR}"/${PN}-tmpfiles.conf
 
 	# remove hal settings, we don't really want to have it around still.
 	rm -r "${D}"/usr/share/hal || die


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2020-05-06 17:25 Michał Górny
  0 siblings, 0 replies; 30+ messages in thread
From: Michał Górny @ 2020-05-06 17:25 UTC (permalink / raw
  To: gentoo-commits

commit:     d2da61ed88093d2902922d2ca60c6b97c3337422
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed May  6 16:57:22 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May  6 17:25:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2da61ed

sys-power/apcupsd: Remove stale sys-freebsd/ deps

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-power/apcupsd/apcupsd-3.14.13.ebuild    | 6 ++----
 sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/sys-power/apcupsd/apcupsd-3.14.13.ebuild b/sys-power/apcupsd/apcupsd-3.14.13.ebuild
index a888ac246e8..b6e3eb60c4f 100644
--- a/sys-power/apcupsd/apcupsd-3.14.13.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,9 +15,7 @@ KEYWORDS="amd64 ~arm ppc x86"
 IUSE="snmp +usb cgi nls gnome kernel_linux"
 
 DEPEND="
-	||	( >=sys-apps/util-linux-2.23[tty-helpers(-)]
-		  sys-freebsd/freebsd-ubin
-		)
+	>=sys-apps/util-linux-2.23[tty-helpers(-)]
 	cgi? ( >=media-libs/gd-1.8.4 )
 	nls? ( sys-devel/gettext )
 	snmp? ( >=net-analyzer/net-snmp-5.7.2 )

diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
index 24060d395a6..4390e39bda5 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,9 +15,7 @@ KEYWORDS="amd64 ~arm ppc x86"
 IUSE="snmp +usb +modbus cgi gnome kernel_linux"
 
 DEPEND="
-	||	( >=sys-apps/util-linux-2.23[tty-helpers(-)]
-		  sys-freebsd/freebsd-ubin
-		)
+	>=sys-apps/util-linux-2.23[tty-helpers(-)]
 	modbus? ( usb? ( virtual/libusb:0 ) )
 	cgi? ( >=media-libs/gd-1.8.4 )
 	snmp? ( >=net-analyzer/net-snmp-5.7.2 )


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2018-10-01 14:04 Sergey Popov
  0 siblings, 0 replies; 30+ messages in thread
From: Sergey Popov @ 2018-10-01 14:04 UTC (permalink / raw
  To: gentoo-commits

commit:     612d1d4af0bc1c062c9711b153e5e0fa803cdc75
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  1 13:58:09 2018 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Oct  1 14:04:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=612d1d4a

sys-power/apcupsd: amd64/ppc/x86 stable, drop old

Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild | 139 ----------------------------
 sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild |   2 +-
 2 files changed, 1 insertion(+), 140 deletions(-)

diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild
deleted file mode 100644
index dc193a1d0fe..00000000000
--- a/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils linux-info flag-o-matic systemd udev
-
-DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
-HOMEPAGE="http://www.apcupsd.org/"
-SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd"
-IUSE="snmp +usb +modbus cgi nls gnome kernel_linux"
-
-DEPEND="
-	||	( >=sys-apps/util-linux-2.23[tty-helpers(-)]
-		  sys-freebsd/freebsd-ubin
-		)
-	modbus? ( usb? ( virtual/libusb:0 ) )
-	cgi? ( >=media-libs/gd-1.8.4 )
-	nls? ( sys-devel/gettext )
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	gnome? ( >=x11-libs/gtk+-2.4.0:2
-		dev-libs/glib:2
-		>=gnome-base/gconf-2.0 )"
-RDEPEND="${DEPEND}
-	virtual/mailx"
-
-CONFIG_CHECK="~USB_HIDDEV ~HIDRAW"
-ERROR_USB_HIDDEV="CONFIG_USB_HIDDEV:	needed to access USB-attached UPSes"
-ERROR_HIDRAW="CONFIG_HIDRAW:		needed to access USB-attached UPSes"
-
-pkg_setup() {
-	if use kernel_linux && use usb && linux_config_exists; then
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.14.9-aliasing.patch"
-}
-
-src_configure() {
-	local myconf
-	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=/usr/libexec/${PN}/cgi-bin"
-	if use usb; then
-		myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --with-dev= "
-		use modbus && myconf="${myconf} --enable-modbus-usb"
-	else
-		myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --disable-usb"
-		use modbus || myconf="${myconf} --disable-modbus"
-	fi
-
-	# We force the DISTNAME to gentoo so it will use gentoo's layout also
-	# when installed on non-linux systems.
-	econf \
-		--sbindir=/sbin \
-		--sysconfdir=/etc/apcupsd \
-		--with-pwrfail-dir=/etc/apcupsd \
-		--with-lock-dir=/run/apcupsd \
-		--with-pid-dir=/run/apcupsd \
-		--with-log-dir=/var/log \
-		--with-nis-port=3551 \
-		--enable-net --enable-pcnet \
-		--with-distname=gentoo \
-		$(use_enable snmp) \
-		$(use_enable gnome gapcmon) \
-		${myconf} \
-		APCUPSD_MAIL=/bin/mail
-}
-
-src_compile() {
-	# Workaround for bug #280674; upstream should really just provide
-	# the text files in the distribution, but I wouldn't count on them
-	# doing that anytime soon.
-	MANPAGER=$(type -p cat) \
-		emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -f "${D}"/etc/init.d/halt || die
-
-	insinto /etc/apcupsd
-	newins examples/safe.apccontrol safe.apccontrol
-	doins "${FILESDIR}"/apcupsd.conf
-
-	dodoc ChangeLog* ReleaseNotes
-	doman doc/*.8 doc/*.5
-
-	dohtml -r doc/manual/*
-
-	rm "${D}"/etc/init.d/apcupsd || die
-	newinitd "${FILESDIR}/${PN}.init.4" "${PN}"
-	newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_dotmpfilesd "${FILESDIR}"/${PN}-tmpfiles.conf
-
-	# remove hal settings, we don't really want to have it around still.
-	rm -r "${D}"/usr/share/hal || die
-
-	# replace it with our udev rules if we're in Linux
-	if use kernel_linux; then
-		udev_newrules "${FILESDIR}"/apcupsd-udev.rules 60-${PN}.rules
-	fi
-
-}
-
-pkg_postinst() {
-	if use cgi; then
-		elog "The cgi-bin directory for ${PN} is /usr/libexec/${PN}/cgi-bin."
-		elog "Set up your ScriptAlias or symbolic links accordingly."
-	fi
-
-	elog ""
-	elog "Since version 3.14.0 you can use multiple apcupsd instances to"
-	elog "control more than one UPS in a single box with openRC."
-	elog "To do this, create a link between /etc/init.d/apcupsd to a new"
-	elog "/etc/init.d/apcupsd.something, and it will then load the"
-	elog "configuration file at /etc/apcupsd/something.conf."
-	elog ""
-
-	elog 'If you want apcupsd to power off your UPS when it'
-	elog 'shuts down your system in a power failure, you must'
-	elog 'add apcupsd.powerfail to your shutdown runlevel:'
-	elog ''
-	elog ' \e[01m rc-update add apcupsd.powerfail shutdown \e[0m'
-	elog ''
-
-	if use kernel_linux; then
-		elog "Starting from version 3.14.9-r1, ${PN} installs udev rules"
-		elog "for persistent device naming. If you have multiple UPS"
-		elog "connected to the machine, you can point them to the devices"
-		elog "in /dev/apcups/by-id directory."
-	fi
-}

diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
index 9212cf4864c..6b1c1f839c9 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd"
 IUSE="snmp +usb +modbus cgi nls gnome kernel_linux"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2018-09-26 15:07 Sergey Popov
  0 siblings, 0 replies; 30+ messages in thread
From: Sergey Popov @ 2018-09-26 15:07 UTC (permalink / raw
  To: gentoo-commits

commit:     c61bad97547bf51723019b3fc91e3280432bcd38
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 26 15:07:07 2018 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Sep 26 15:07:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c61bad97

sys-power/apcupsd: revision bump

Bump EAPI to 6. Fix hardcoded path to mail utility from virtual/mailx

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild | 138 ++++++++++++++++++++++++++++
 1 file changed, 138 insertions(+)

diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
new file mode 100644
index 00000000000..9212cf4864c
--- /dev/null
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r2.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info flag-o-matic systemd udev
+
+DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
+HOMEPAGE="http://www.apcupsd.org/"
+SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+IUSE="snmp +usb +modbus cgi nls gnome kernel_linux"
+
+DEPEND="
+	||	( >=sys-apps/util-linux-2.23[tty-helpers(-)]
+		  sys-freebsd/freebsd-ubin
+		)
+	modbus? ( usb? ( virtual/libusb:0 ) )
+	cgi? ( >=media-libs/gd-1.8.4 )
+	nls? ( sys-devel/gettext )
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	gnome? ( >=x11-libs/gtk+-2.4.0:2
+		dev-libs/glib:2
+		>=gnome-base/gconf-2.0 )"
+RDEPEND="${DEPEND}
+	virtual/mailx"
+
+CONFIG_CHECK="~USB_HIDDEV ~HIDRAW"
+ERROR_USB_HIDDEV="CONFIG_USB_HIDDEV:	needed to access USB-attached UPSes"
+ERROR_HIDRAW="CONFIG_HIDRAW:		needed to access USB-attached UPSes"
+
+DOCS=( ChangeLog ReleaseNotes )
+HTML_DOCS=( doc/manual )
+PATCHES=( "${FILESDIR}/${PN}-3.14.9-aliasing.patch" )
+
+pkg_setup() {
+	if use kernel_linux && use usb && linux_config_exists; then
+		check_extra_config
+	fi
+}
+
+src_configure() {
+	local myconf
+	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=/usr/libexec/${PN}/cgi-bin"
+	if use usb; then
+		myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --with-dev= "
+		use modbus && myconf="${myconf} --enable-modbus-usb"
+	else
+		myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --disable-usb"
+		use modbus || myconf="${myconf} --disable-modbus"
+	fi
+
+	# We force the DISTNAME to gentoo so it will use gentoo's layout also
+	# when installed on non-linux systems.
+	econf \
+		--sbindir=/sbin \
+		--sysconfdir=/etc/apcupsd \
+		--with-pwrfail-dir=/etc/apcupsd \
+		--with-lock-dir=/run/apcupsd \
+		--with-pid-dir=/run/apcupsd \
+		--with-log-dir=/var/log \
+		--with-nis-port=3551 \
+		--enable-net --enable-pcnet \
+		--with-distname=gentoo \
+		$(use_enable snmp) \
+		$(use_enable gnome gapcmon) \
+		${myconf} \
+		APCUPSD_MAIL=$(type -p mail)
+}
+
+src_compile() {
+	# Workaround for bug #280674; upstream should really just provide
+	# the text files in the distribution, but I wouldn't count on them
+	# doing that anytime soon.
+	MANPAGER=$(type -p cat) \
+		emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -f "${D}"/etc/init.d/halt || die
+
+	insinto /etc/apcupsd
+	newins examples/safe.apccontrol safe.apccontrol
+	doins "${FILESDIR}"/apcupsd.conf
+
+	doman doc/*.8 doc/*.5
+
+	einstalldocs
+
+	rm "${D}"/etc/init.d/apcupsd || die
+	newinitd "${FILESDIR}/${PN}.init.4" "${PN}"
+	newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}-tmpfiles.conf
+
+	# remove hal settings, we don't really want to have it around still.
+	rm -r "${D}"/usr/share/hal || die
+
+	# replace it with our udev rules if we're in Linux
+	if use kernel_linux; then
+		udev_newrules "${FILESDIR}"/apcupsd-udev.rules 60-${PN}.rules
+	fi
+
+}
+
+pkg_postinst() {
+	if use cgi; then
+		elog "The cgi-bin directory for ${PN} is /usr/libexec/${PN}/cgi-bin."
+		elog "Set up your ScriptAlias or symbolic links accordingly."
+	fi
+
+	elog ""
+	elog "Since version 3.14.0 you can use multiple apcupsd instances to"
+	elog "control more than one UPS in a single box with openRC."
+	elog "To do this, create a link between /etc/init.d/apcupsd to a new"
+	elog "/etc/init.d/apcupsd.something, and it will then load the"
+	elog "configuration file at /etc/apcupsd/something.conf."
+	elog ""
+
+	elog 'If you want apcupsd to power off your UPS when it'
+	elog 'shuts down your system in a power failure, you must'
+	elog 'add apcupsd.powerfail to your shutdown runlevel:'
+	elog ''
+	elog ' \e[01m rc-update add apcupsd.powerfail shutdown \e[0m'
+	elog ''
+
+	if use kernel_linux; then
+		elog "Starting from version 3.14.9-r1, ${PN} installs udev rules"
+		elog "for persistent device naming. If you have multiple UPS"
+		elog "connected to the machine, you can point them to the devices"
+		elog "in /dev/apcups/by-id directory."
+	fi
+}


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2018-08-26 20:35 Michał Górny
  0 siblings, 0 replies; 30+ messages in thread
From: Michał Górny @ 2018-08-26 20:35 UTC (permalink / raw
  To: gentoo-commits

commit:     86aac63a058c2b633f6cb4612fe4671f9badda0f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 26 20:21:36 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 26 20:34:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86aac63a

sys-power/apcupsd: Remove support for non-existent deps

 sys-power/apcupsd/apcupsd-3.14.13.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys-power/apcupsd/apcupsd-3.14.13.ebuild b/sys-power/apcupsd/apcupsd-3.14.13.ebuild
index f4a462f5b7e..08695428abc 100644
--- a/sys-power/apcupsd/apcupsd-3.14.13.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,6 @@ IUSE="snmp +usb cgi nls gnome kernel_linux"
 
 DEPEND="
 	||	( >=sys-apps/util-linux-2.23[tty-helpers(-)]
-		  <=sys-apps/sysvinit-2.88-r4
 		  sys-freebsd/freebsd-ubin
 		)
 	cgi? ( >=media-libs/gd-1.8.4 )


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2018-03-14 19:19 Mikle Kolyada
  0 siblings, 0 replies; 30+ messages in thread
From: Mikle Kolyada @ 2018-03-14 19:19 UTC (permalink / raw
  To: gentoo-commits

commit:     062e819ca03c57caf93170c4edb6636039d63110
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 14 19:18:39 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Mar 14 19:19:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=062e819c

sys-power/apcupsd: Drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-power/apcupsd/apcupsd-3.14.14.ebuild | 136 -------------------------------
 1 file changed, 136 deletions(-)

diff --git a/sys-power/apcupsd/apcupsd-3.14.14.ebuild b/sys-power/apcupsd/apcupsd-3.14.14.ebuild
deleted file mode 100644
index 06483304207..00000000000
--- a/sys-power/apcupsd/apcupsd-3.14.14.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils linux-info flag-o-matic systemd udev
-
-DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
-HOMEPAGE="http://www.apcupsd.org/"
-SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
-IUSE="snmp +usb cgi nls gnome kernel_linux"
-
-DEPEND="
-	||	( >=sys-apps/util-linux-2.23[tty-helpers(-)]
-		  sys-freebsd/freebsd-ubin
-		)
-	cgi? ( >=media-libs/gd-1.8.4 )
-	nls? ( sys-devel/gettext )
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	gnome? ( >=x11-libs/gtk+-2.4.0:2
-		dev-libs/glib:2
-		>=gnome-base/gconf-2.0 )"
-RDEPEND="${DEPEND}
-	virtual/mailx"
-
-CONFIG_CHECK="~USB_HIDDEV ~HIDRAW"
-ERROR_USB_HIDDEV="CONFIG_USB_HIDDEV:	needed to access USB-attached UPSes"
-ERROR_HIDRAW="CONFIG_HIDRAW:		needed to access USB-attached UPSes"
-
-pkg_setup() {
-	if use kernel_linux && use usb && linux_config_exists; then
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.14.9-aliasing.patch"
-}
-
-src_configure() {
-	local myconf
-	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=/usr/libexec/${PN}/cgi-bin"
-	if use usb; then
-		myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --with-dev= "
-	else
-		myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --disable-usb"
-	fi
-
-	# We force the DISTNAME to gentoo so it will use gentoo's layout also
-	# when installed on non-linux systems.
-	econf \
-		--sbindir=/sbin \
-		--sysconfdir=/etc/apcupsd \
-		--with-pwrfail-dir=/etc/apcupsd \
-		--with-lock-dir=/run/apcupsd \
-		--with-pid-dir=/run/apcupsd \
-		--with-log-dir=/var/log \
-		--with-nis-port=3551 \
-		--enable-net --enable-pcnet \
-		--with-distname=gentoo \
-		$(use_enable snmp) \
-		$(use_enable gnome gapcmon) \
-		${myconf} \
-		APCUPSD_MAIL=/bin/mail
-}
-
-src_compile() {
-	# Workaround for bug #280674; upstream should really just provide
-	# the text files in the distribution, but I wouldn't count on them
-	# doing that anytime soon.
-	MANPAGER=$(type -p cat) \
-		emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -f "${D}"/etc/init.d/halt || die
-
-	insinto /etc/apcupsd
-	newins examples/safe.apccontrol safe.apccontrol
-	doins "${FILESDIR}"/apcupsd.conf
-
-	dodoc ChangeLog* ReleaseNotes
-	doman doc/*.8 doc/*.5
-
-	dohtml -r doc/manual/*
-
-	rm "${D}"/etc/init.d/apcupsd || die
-	newinitd "${FILESDIR}/${PN}.init.4" "${PN}"
-	newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_dotmpfilesd "${FILESDIR}"/${PN}-tmpfiles.conf
-
-	# remove hal settings, we don't really want to have it around still.
-	rm -r "${D}"/usr/share/hal || die
-
-	# replace it with our udev rules if we're in Linux
-	if use kernel_linux; then
-		udev_newrules "${FILESDIR}"/apcupsd-udev.rules 60-${PN}.rules
-	fi
-
-}
-
-pkg_postinst() {
-	if use cgi; then
-		elog "The cgi-bin directory for ${PN} is /usr/libexec/${PN}/cgi-bin."
-		elog "Set up your ScriptAlias or symbolic links accordingly."
-	fi
-
-	elog ""
-	elog "Since version 3.14.0 you can use multiple apcupsd instances to"
-	elog "control more than one UPS in a single box with openRC."
-	elog "To do this, create a link between /etc/init.d/apcupsd to a new"
-	elog "/etc/init.d/apcupsd.something, and it will then load the"
-	elog "configuration file at /etc/apcupsd/something.conf."
-	elog ""
-
-	elog 'If you want apcupsd to power off your UPS when it'
-	elog 'shuts down your system in a power failure, you must'
-	elog 'add apcupsd.powerfail to your shutdown runlevel:'
-	elog ''
-	elog ' \e[01m rc-update add apcupsd.powerfail shutdown \e[0m'
-	elog ''
-
-	if use kernel_linux; then
-		elog "Starting from version 3.14.9-r1, ${PN} installs udev rules"
-		elog "for persistent device naming. If you have multiple UPS"
-		elog "connected to the machine, you can point them to the devices"
-		elog "in /dev/apcups/by-id directory."
-	fi
-}


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2018-01-07 23:38 Mikle Kolyada
  0 siblings, 0 replies; 30+ messages in thread
From: Mikle Kolyada @ 2018-01-07 23:38 UTC (permalink / raw
  To: gentoo-commits

commit:     c97fba8553f6da50d7b27660c557db9141a2ecba
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 23:38:06 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 23:38:06 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c97fba85

sys-power/apcupsd: amd64 stable wrt bug #643112

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild
index c1e6e5c5568..dc193a1d0fe 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ppc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc x86 ~x86-fbsd"
 IUSE="snmp +usb +modbus cgi nls gnome kernel_linux"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2018-01-07 14:23 Sergei Trofimovich
  0 siblings, 0 replies; 30+ messages in thread
From: Sergei Trofimovich @ 2018-01-07 14:23 UTC (permalink / raw
  To: gentoo-commits

commit:     f3c170d62d9c4a5a7b883e39128363e951bc6b8a
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 14:20:08 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 14:23:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3c170d6

sys-power/apcupsd: stable 3.14.14-r1 for ppc, bug #643112

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc"

 sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild
index 216d0321681..c1e6e5c5568 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ppc x86 ~x86-fbsd"
 IUSE="snmp +usb +modbus cgi nls gnome kernel_linux"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2017-11-26 23:26 David Seifert
  0 siblings, 0 replies; 30+ messages in thread
From: David Seifert @ 2017-11-26 23:26 UTC (permalink / raw
  To: gentoo-commits

commit:     7e85af434b9056acbb5ceec1965e77d8f9901ac6
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 26 13:02:03 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 26 23:25:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e85af43

sys-power/apcupsd: [QA] Consistent whitespace in metadata.xml

 sys-power/apcupsd/metadata.xml | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/sys-power/apcupsd/metadata.xml b/sys-power/apcupsd/metadata.xml
index 275b13d12ab..7254904a446 100644
--- a/sys-power/apcupsd/metadata.xml
+++ b/sys-power/apcupsd/metadata.xml
@@ -13,23 +13,21 @@
 		<email>base-system@gentoo.org</email>
 		<name>Gentoo Base System</name>
 	</maintainer>
-<longdescription lang="en">
-Apcupsd can be used for power mangement and controlling most of 
-APC's UPS models on Unix and Windows machines. Apcupsd works with 
-most of APC's Smart-UPS models as well as most simple signalling 
-models such a Back-UPS, and BackUPS-Office. During a power failure, 
-apcupsd will inform the users about the power failure and that a 
-shutdown may occur. If power is not restored, a system shutdown 
-will follow when the battery is exhausted, a timeout (seconds) 
-expires, or runtime expires based on internal APC calculations 
-determined by power consumption rates.
-</longdescription>
-<upstream>
-	<remote-id type="sourceforge">apcupsd</remote-id>
-</upstream>
-<use>
-	<flag name="modbus">
-	  enable MODBUS support over USB
-	</flag>
-</use>
+	<longdescription lang="en">
+		Apcupsd can be used for power mangement and controlling most of
+		APC's UPS models on Unix and Windows machines. Apcupsd works with
+		most of APC's Smart-UPS models as well as most simple signalling
+		models such a Back-UPS, and BackUPS-Office. During a power failure,
+		apcupsd will inform the users about the power failure and that a
+		shutdown may occur. If power is not restored, a system shutdown
+		will follow when the battery is exhausted, a timeout (seconds)
+		expires, or runtime expires based on internal APC calculations
+		determined by power consumption rates.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">apcupsd</remote-id>
+	</upstream>
+	<use>
+		<flag name="modbus">Enable MODBUS support over USB</flag>
+	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2016-11-23 20:52 Kristian Fiskerstrand
  0 siblings, 0 replies; 30+ messages in thread
From: Kristian Fiskerstrand @ 2016-11-23 20:52 UTC (permalink / raw
  To: gentoo-commits

commit:     0e6a712200b73ade0543ea5c9581ab351b8840ab
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 20:52:27 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 20:52:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e6a7122

sys-power/apcupsd: Add proxied maintainer

Gentoo-Bug: 597292

Package-Manager: portage-2.3.2

 sys-power/apcupsd/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sys-power/apcupsd/metadata.xml b/sys-power/apcupsd/metadata.xml
index 71f0933..275b13d 100644
--- a/sys-power/apcupsd/metadata.xml
+++ b/sys-power/apcupsd/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>john.einar@gmail.com</email>
+		<name>John Einar Reitan</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>k_f@gentoo.org</email>
 		<name>Kristian Fiskerstrand</name>
 	</maintainer>


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2016-11-18 23:39 Kristian Fiskerstrand
  0 siblings, 0 replies; 30+ messages in thread
From: Kristian Fiskerstrand @ 2016-11-18 23:39 UTC (permalink / raw
  To: gentoo-commits

commit:     805b76407ea2d40e78fd5c3078b2429761c9f7d5
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 18 23:39:28 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Fri Nov 18 23:39:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=805b7640

sys-power/apcupsd: Add support for modbus

Gentoo-Bug: 597292

Package-Manager: portage-2.3.2

 sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild | 140 ++++++++++++++++++++++++++++
 sys-power/apcupsd/metadata.xml              |   5 +
 2 files changed, 145 insertions(+)

diff --git a/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild b/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild
new file mode 100644
index 00000000..766685f
--- /dev/null
+++ b/sys-power/apcupsd/apcupsd-3.14.14-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils linux-info flag-o-matic systemd udev
+
+DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
+HOMEPAGE="http://www.apcupsd.org/"
+SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+IUSE="snmp +usb +modbus cgi nls gnome kernel_linux"
+
+DEPEND="
+	||	( >=sys-apps/util-linux-2.23[tty-helpers(-)]
+		  sys-freebsd/freebsd-ubin
+		)
+	modbus? ( usb? ( virtual/libusb:0 ) )
+	cgi? ( >=media-libs/gd-1.8.4 )
+	nls? ( sys-devel/gettext )
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	gnome? ( >=x11-libs/gtk+-2.4.0:2
+		dev-libs/glib:2
+		>=gnome-base/gconf-2.0 )"
+RDEPEND="${DEPEND}
+	virtual/mailx"
+
+CONFIG_CHECK="~USB_HIDDEV ~HIDRAW"
+ERROR_USB_HIDDEV="CONFIG_USB_HIDDEV:	needed to access USB-attached UPSes"
+ERROR_HIDRAW="CONFIG_HIDRAW:		needed to access USB-attached UPSes"
+
+pkg_setup() {
+	if use kernel_linux && use usb && linux_config_exists; then
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.14.9-aliasing.patch"
+}
+
+src_configure() {
+	local myconf
+	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=/usr/libexec/${PN}/cgi-bin"
+	if use usb; then
+		myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --with-dev= "
+		use modbus && myconf="${myconf} --enable-modbus-usb"
+	else
+		myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --disable-usb"
+		use modbus || myconf="${myconf} --disable-modbus"
+	fi
+
+	# We force the DISTNAME to gentoo so it will use gentoo's layout also
+	# when installed on non-linux systems.
+	econf \
+		--sbindir=/sbin \
+		--sysconfdir=/etc/apcupsd \
+		--with-pwrfail-dir=/etc/apcupsd \
+		--with-lock-dir=/run/apcupsd \
+		--with-pid-dir=/run/apcupsd \
+		--with-log-dir=/var/log \
+		--with-nis-port=3551 \
+		--enable-net --enable-pcnet \
+		--with-distname=gentoo \
+		$(use_enable snmp) \
+		$(use_enable gnome gapcmon) \
+		${myconf} \
+		APCUPSD_MAIL=/bin/mail
+}
+
+src_compile() {
+	# Workaround for bug #280674; upstream should really just provide
+	# the text files in the distribution, but I wouldn't count on them
+	# doing that anytime soon.
+	MANPAGER=$(type -p cat) \
+		emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -f "${D}"/etc/init.d/halt || die
+
+	insinto /etc/apcupsd
+	newins examples/safe.apccontrol safe.apccontrol
+	doins "${FILESDIR}"/apcupsd.conf
+
+	dodoc ChangeLog* ReleaseNotes
+	doman doc/*.8 doc/*.5
+
+	dohtml -r doc/manual/*
+
+	rm "${D}"/etc/init.d/apcupsd || die
+	newinitd "${FILESDIR}/${PN}.init.4" "${PN}"
+	newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}-tmpfiles.conf
+
+	# remove hal settings, we don't really want to have it around still.
+	rm -r "${D}"/usr/share/hal || die
+
+	# replace it with our udev rules if we're in Linux
+	if use kernel_linux; then
+		udev_newrules "${FILESDIR}"/apcupsd-udev.rules 60-${PN}.rules
+	fi
+
+}
+
+pkg_postinst() {
+	if use cgi; then
+		elog "The cgi-bin directory for ${PN} is /usr/libexec/${PN}/cgi-bin."
+		elog "Set up your ScriptAlias or symbolic links accordingly."
+	fi
+
+	elog ""
+	elog "Since version 3.14.0 you can use multiple apcupsd instances to"
+	elog "control more than one UPS in a single box with openRC."
+	elog "To do this, create a link between /etc/init.d/apcupsd to a new"
+	elog "/etc/init.d/apcupsd.something, and it will then load the"
+	elog "configuration file at /etc/apcupsd/something.conf."
+	elog ""
+
+	elog 'If you want apcupsd to power off your UPS when it'
+	elog 'shuts down your system in a power failure, you must'
+	elog 'add apcupsd.powerfail to your shutdown runlevel:'
+	elog ''
+	elog ' \e[01m rc-update add apcupsd.powerfail shutdown \e[0m'
+	elog ''
+
+	if use kernel_linux; then
+		elog "Starting from version 3.14.9-r1, ${PN} installs udev rules"
+		elog "for persistent device naming. If you have multiple UPS"
+		elog "connected to the machine, you can point them to the devices"
+		elog "in /dev/apcups/by-id directory."
+	fi
+}

diff --git a/sys-power/apcupsd/metadata.xml b/sys-power/apcupsd/metadata.xml
index de7a495..71f0933 100644
--- a/sys-power/apcupsd/metadata.xml
+++ b/sys-power/apcupsd/metadata.xml
@@ -23,4 +23,9 @@ determined by power consumption rates.
 <upstream>
 	<remote-id type="sourceforge">apcupsd</remote-id>
 </upstream>
+<use>
+	<flag name="modbus">
+	  enable MODBUS support over USB
+	</flag>
+</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2016-09-28 21:17 Kristian Fiskerstrand
  0 siblings, 0 replies; 30+ messages in thread
From: Kristian Fiskerstrand @ 2016-09-28 21:17 UTC (permalink / raw
  To: gentoo-commits

commit:     82a2fab3856a3dd33079e76bfc6efc8815d046f0
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 21:17:02 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 21:17:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82a2fab3

sys-power/apcupsd: Fixup missing || die

Package-Manager: portage-2.3.1

 sys-power/apcupsd/apcupsd-3.14.14.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-power/apcupsd/apcupsd-3.14.14.ebuild b/sys-power/apcupsd/apcupsd-3.14.14.ebuild
index 22b9887..02c1086 100644
--- a/sys-power/apcupsd/apcupsd-3.14.14.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.14.ebuild
@@ -74,12 +74,12 @@ src_compile() {
 	# the text files in the distribution, but I wouldn't count on them
 	# doing that anytime soon.
 	MANPAGER=$(type -p cat) \
-		emake || die "emake failed"
+		emake
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
-	rm -f "${D}"/etc/init.d/halt
+	rm -f "${D}"/etc/init.d/halt || die
 
 	insinto /etc/apcupsd
 	newins examples/safe.apccontrol safe.apccontrol
@@ -90,7 +90,7 @@ src_install() {
 
 	dohtml -r doc/manual/*
 
-	rm "${D}"/etc/init.d/apcupsd
+	rm "${D}"/etc/init.d/apcupsd || die
 	newinitd "${FILESDIR}/${PN}.init.4" "${PN}"
 	newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail
 
@@ -98,7 +98,7 @@ src_install() {
 	systemd_dotmpfilesd "${FILESDIR}"/${PN}-tmpfiles.conf
 
 	# remove hal settings, we don't really want to have it around still.
-	rm -r "${D}"/usr/share/hal
+	rm -r "${D}"/usr/share/hal || die
 
 	# replace it with our udev rules if we're in Linux
 	if use kernel_linux; then


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2016-09-28 21:11 Kristian Fiskerstrand
  0 siblings, 0 replies; 30+ messages in thread
From: Kristian Fiskerstrand @ 2016-09-28 21:11 UTC (permalink / raw
  To: gentoo-commits

commit:     fbfd8bf94131ac2794c5b27c1ff7fdaf3bbef6f3
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 21:10:40 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 21:11:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbfd8bf9

sys-power/apcupsd: Cleanup old

Package-Manager: portage-2.3.1

 sys-power/apcupsd/Manifest                  |   2 -
 sys-power/apcupsd/apcupsd-3.14.12-r1.ebuild | 139 ----------------------------
 sys-power/apcupsd/apcupsd-3.14.8-r2.ebuild  | 134 ---------------------------
 3 files changed, 275 deletions(-)

diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 2173d81..96aa1ee 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -1,4 +1,2 @@
-DIST apcupsd-3.14.12.tar.gz 2014699 SHA256 1b4f703cb19cfdf44daf173dc8394cafd30fee0b30a0c75a7d19db622454a440 SHA512 2ed409ce4c7c7af667cecf0c73c47315d7516c696383c811945ead720afc146fe2ceda0efef722c3208a1b41a7d4661c9544bc4fe37a36ca4779a5dc1621f3d4 WHIRLPOOL 13a2491e4ad5446ba91a075f7408e48e94a35885288c9ee6108891d89412be5c81f69f4ab5064f86b8bece8c0de44357e4c378d05aad5d9d27bd85f0d95a83d5
 DIST apcupsd-3.14.13.tar.gz 1935043 SHA256 57ecbde01d0448bf8c4dbfe0ad016724ae66ab98adf2de955bf2be553c5d03f9 SHA512 74f7763de268626e24f9dd99090b01d5bff35c2fde769039104105ec27941673d1613c41fcac11e3d97d2fe5c364bcc0459847fcba5d2f7f1aac85795d6d8570 WHIRLPOOL 4b6fb18848aa597bae1066a7f195747f9edfdee75a27e43e3d14e3153d4b434829c5863b7e92c0704ea652583b8c5885fd01fe7280abe93bf1c6cfc370434f73
 DIST apcupsd-3.14.14.tar.gz 1843409 SHA256 db7748559b6b4c3784f9856561ef6ac6199ef7bd019b3edcd7e0a647bf8f9867 SHA512 c953bbf3e08f809748a7978a3952604176390d1cd276f187fe096d9bc3c8993b52127e8350c0363387da41318e24b4d1e00ea58df71f3bb8f50c9a5a64cd2d7f WHIRLPOOL 9b50390558b3a6192a631ff3dce398d947fb19123969604d2a89ff69a2373beff6a62c314ce351caeb9d9b736fcb8d622a75899166a3710c4c557c5a841c5adc
-DIST apcupsd-3.14.8.tar.gz 1317601 SHA256 8e7f2574d3abaf6637da3e790860c3f9ba64fab1ec7e50bb080de4439441c5a7 SHA512 07e6a15538bf1824b5063a1a93f33231639cf962e658c0dada1b244f2554af81824825d807ea81fd0388e25ed8fac0957621bfded96e3faeb7b594548fc4d418 WHIRLPOOL e5a580afc4955a373f020cb6e4ccbf07f9f020d4c15eaae59b416499c25a00b9d4bbc6af012bd2529024e8a3668a1d7c47f19f1bcb99f5ba60dc0108fa13c4f2

diff --git a/sys-power/apcupsd/apcupsd-3.14.12-r1.ebuild b/sys-power/apcupsd/apcupsd-3.14.12-r1.ebuild
deleted file mode 100644
index 75d43a7..00000000
--- a/sys-power/apcupsd/apcupsd-3.14.12-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils linux-info flag-o-matic systemd udev
-
-DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
-HOMEPAGE="http://www.apcupsd.org/"
-SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
-IUSE="snmp +usb cgi nls gnome kernel_linux"
-
-DEPEND="
-	||	( >=sys-apps/util-linux-2.23[tty-helpers(-)]
-		  <=sys-apps/sysvinit-2.88-r4
-		  sys-freebsd/freebsd-ubin
-		)
-	cgi? ( >=media-libs/gd-1.8.4 )
-	nls? ( sys-devel/gettext )
-	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
-	gnome? ( >=x11-libs/gtk+-2.4.0:2
-		dev-libs/glib:2
-		>=gnome-base/gconf-2.0 )"
-RDEPEND="${DEPEND}
-	sys-apps/openrc
-	virtual/mailx"
-
-CONFIG_CHECK="~USB_HIDDEV ~HIDRAW"
-ERROR_USB_HIDDEV="CONFIG_USB_HIDDEV:	needed to access USB-attached UPSes"
-ERROR_HIDRAW="CONFIG_HIDRAW:		needed to access USB-attached UPSes"
-
-pkg_setup() {
-	if use kernel_linux && use usb && linux_config_exists; then
-		check_extra_config
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.14.9-aliasing.patch"
-}
-
-src_configure() {
-	local myconf
-	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=/usr/libexec/${PN}/cgi-bin"
-	if use usb; then
-		myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --with-dev= "
-	else
-		myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --disable-usb"
-	fi
-
-	# We force the DISTNAME to gentoo so it will use gentoo's layout also
-	# when installed on non-linux systems.
-	econf \
-		--sbindir=/sbin \
-		--sysconfdir=/etc/apcupsd \
-		--with-pwrfail-dir=/etc/apcupsd \
-		--with-lock-dir=/run/apcupsd \
-		--with-pid-dir=/run/apcupsd \
-		--with-log-dir=/var/log \
-		--with-nis-port=3551 \
-		--enable-net --enable-pcnet \
-		--with-distname=gentoo \
-		$(use_enable snmp net-snmp) \
-		$(use_enable gnome gapcmon) \
-		${myconf} \
-		APCUPSD_MAIL=/bin/mail
-}
-
-src_compile() {
-	# Workaround for bug #280674; upstream should really just provide
-	# the text files in the distribution, but I wouldn't count on them
-	# doing that anytime soon.
-	MANPAGER=$(type -p cat) \
-		emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "installed failed"
-	rm -f "${D}"/etc/init.d/halt
-
-	insinto /etc/apcupsd
-	newins examples/safe.apccontrol safe.apccontrol
-	doins "${FILESDIR}"/apcupsd.conf
-
-	dodoc ChangeLog* ReleaseNotes
-	doman doc/*.8 doc/*.5
-
-	dohtml -r doc/manual/*
-
-	rm "${D}"/etc/init.d/apcupsd
-	newinitd "${FILESDIR}/${PN}.init.4" "${PN}"
-	newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_dotmpfilesd "${FILESDIR}"/${PN}-tmpfiles.conf
-
-	# remove hal settings, we don't really want to have it around still.
-	rm -r "${D}"/usr/share/hal
-
-	# replace it with our udev rules if we're in Linux
-	if use kernel_linux; then
-		udev_newrules "${FILESDIR}"/apcupsd-udev.rules 60-${PN}.rules
-	fi
-
-}
-
-pkg_postinst() {
-	if use cgi; then
-		elog "The cgi-bin directory for ${PN} is /usr/libexec/${PN}/cgi-bin."
-		elog "Set up your ScriptAlias or symbolic links accordingly."
-	fi
-
-	elog ""
-	elog "Since version 3.14.0 you can use multiple apcupsd instances to"
-	elog "control more than one UPS in a single box with openRC."
-	elog "To do this, create a link between /etc/init.d/apcupsd to a new"
-	elog "/etc/init.d/apcupsd.something, and it will then load the"
-	elog "configuration file at /etc/apcupsd/something.conf."
-	elog ""
-
-	elog 'If you want apcupsd to power off your UPS when it'
-	elog 'shuts down your system in a power failure, you must'
-	elog 'add apcupsd.powerfail to your shutdown runlevel:'
-	elog ''
-	elog ' \e[01m rc-update add apcupsd.powerfail shutdown \e[0m'
-	elog ''
-
-	if use kernel_linux; then
-		elog "Starting from version 3.14.9-r1, ${PN} installs udev rules"
-		elog "for persistent device naming. If you have multiple UPS"
-		elog "connected to the machine, you can point them to the devices"
-		elog "in /dev/apcups/by-id directory."
-	fi
-}

diff --git a/sys-power/apcupsd/apcupsd-3.14.8-r2.ebuild b/sys-power/apcupsd/apcupsd-3.14.8-r2.ebuild
deleted file mode 100644
index d1744af..00000000
--- a/sys-power/apcupsd/apcupsd-3.14.8-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-inherit eutils linux-info flag-o-matic systemd
-
-DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
-HOMEPAGE="http://www.apcupsd.org/"
-SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="snmp +usb cgi nls gnome kernel_linux"
-
-DEPEND="
-	||	( >=sys-apps/util-linux-2.23[tty-helpers]
-		  <=sys-apps/sysvinit-2.88-r4
-		  sys-freebsd/freebsd-ubin
-		)
-	cgi? ( >=media-libs/gd-1.8.4 )
-	nls? ( sys-devel/gettext )
-	snmp? ( net-analyzer/net-snmp )
-	gnome? ( >=x11-libs/gtk+-2.4.0:2
-		dev-libs/glib:2
-		>=gnome-base/gconf-2.0 )"
-RDEPEND="${DEPEND}
-	virtual/mailx"
-
-CONFIG_CHECK="~USB_HIDDEV ~HIDRAW"
-ERROR_USB_HIDDEV="CONFIG_USB_HIDDEV:	needed to access USB-attached UPSes"
-ERROR_HIDRAW="CONFIG_HIDRAW:		needed to access USB-attached UPSes"
-
-pkg_setup() {
-	if use kernel_linux && use usb && linux_config_exists; then
-		check_extra_config
-	fi
-}
-
-src_configure() {
-	local myconf
-	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=/usr/libexec/${PN}/cgi-bin"
-	if use usb; then
-		myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --with-dev= "
-	else
-		myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --disable-usb"
-	fi
-
-	append-flags -fno-strict-aliasing
-
-	# We force the DISTNAME to gentoo so it will use gentoo's layout also
-	# when installed on non-linux systems.
-	econf \
-		--sbindir=/sbin \
-		--sysconfdir=/etc/apcupsd \
-		--with-pwrfail-dir=/etc/apcupsd \
-		--with-lock-dir=/var/lock \
-		--with-pid-dir=/var/run \
-		--with-log-dir=/var/log \
-		--with-nis-port=3551 \
-		--enable-net --enable-pcnet \
-		--with-distname=gentoo \
-		$(use_enable snmp net-snmp) \
-		$(use_enable gnome gapcmon) \
-		${myconf} \
-		APCUPSD_MAIL=/bin/mail \
-		|| die "econf failed"
-}
-
-src_compile() {
-	# Workaround for bug #280674; upstream should really just provide
-	# the text files in the distribution, but I wouldn't count on them
-	# doing that anytime soon.
-	MANPAGER=$(type -p cat) \
-		emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "installed failed"
-	rm -f "${D}"/etc/init.d/halt
-
-	insinto /etc/apcupsd
-	newins examples/safe.apccontrol safe.apccontrol
-
-	dodoc ChangeLog* ReleaseNotes
-	doman doc/*.8 doc/*.5 || die "doman failed"
-
-	dohtml -r doc/manual/* || die "dodoc failed"
-
-	rm "${D}"/etc/init.d/apcupsd
-	newinitd "${FILESDIR}/${PN}.init.2a" "${PN}" || die "newinitd failed"
-	systemd_dounit "${FILESDIR}"/${PN}.service
-	systemd_dotmpfilesd "${FILESDIR}"/${PN}-tmpfiles.conf
-
-	if has_version sys-apps/openrc; then
-		newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail || die "newinitd failed"
-	fi
-
-	# remove hal settings, we don't really want to have it around still.
-	rm -r "${D}"/usr/share/hal
-
-	# Without this it'll crash at startup. When merging in ROOT= this
-	# won't be created by default, so we want to make sure we got it!
-	keepdir /var/lock
-	fowners root:uucp /var/lock
-	fperms 0775 /var/lock
-}
-
-pkg_postinst() {
-	if use cgi; then
-		elog "The cgi-bin directory for ${PN} is /usr/libexec/${PN}/cgi-bin."
-		elog "Set up your ScriptAlias or symbolic links accordingly."
-	fi
-
-	elog ""
-	elog "Since version 3.14.0 you can use multiple apcupsd instances to"
-	elog "control more than one UPS in a single box."
-	elog "To do this, create a link between /etc/init.d/apcupsd to a new"
-	elog "/etc/init.d/apcupsd.something, and it will then load the"
-	elog "configuration file at /etc/apcupsd/something.conf."
-	elog ""
-
-	if [ -d "${ROOT}"/etc/runlevels/shutdown -a \
-			! -e "${ROOT}"/etc/runlevels/shutdown/"${PN}".powerfail ] ; then
-		elog 'If you want apcupsd to power off your UPS when it'
-		elog 'shuts down your system in a power failure, you must'
-		elog 'add apcupsd.powerfail to your shutdown runlevel:'
-		elog ''
-		elog ' \e[01m rc-update add apcupsd.powerfail shutdown \e[0m'
-		elog ''
-	fi
-}


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2016-09-28 21:11 Kristian Fiskerstrand
  0 siblings, 0 replies; 30+ messages in thread
From: Kristian Fiskerstrand @ 2016-09-28 21:11 UTC (permalink / raw
  To: gentoo-commits

commit:     bbe4e2bfb714636cb9d721042f423845a341b1a7
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 21:09:27 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 21:11:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbe4e2bf

sys-power/apcupsd: Version bump 3.14.14

Package-Manager: portage-2.3.1

 sys-power/apcupsd/Manifest               |   1 +
 sys-power/apcupsd/apcupsd-3.14.14.ebuild | 137 +++++++++++++++++++++++++++++++
 2 files changed, 138 insertions(+)

diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 9e4e80d..2173d81 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -1,3 +1,4 @@
 DIST apcupsd-3.14.12.tar.gz 2014699 SHA256 1b4f703cb19cfdf44daf173dc8394cafd30fee0b30a0c75a7d19db622454a440 SHA512 2ed409ce4c7c7af667cecf0c73c47315d7516c696383c811945ead720afc146fe2ceda0efef722c3208a1b41a7d4661c9544bc4fe37a36ca4779a5dc1621f3d4 WHIRLPOOL 13a2491e4ad5446ba91a075f7408e48e94a35885288c9ee6108891d89412be5c81f69f4ab5064f86b8bece8c0de44357e4c378d05aad5d9d27bd85f0d95a83d5
 DIST apcupsd-3.14.13.tar.gz 1935043 SHA256 57ecbde01d0448bf8c4dbfe0ad016724ae66ab98adf2de955bf2be553c5d03f9 SHA512 74f7763de268626e24f9dd99090b01d5bff35c2fde769039104105ec27941673d1613c41fcac11e3d97d2fe5c364bcc0459847fcba5d2f7f1aac85795d6d8570 WHIRLPOOL 4b6fb18848aa597bae1066a7f195747f9edfdee75a27e43e3d14e3153d4b434829c5863b7e92c0704ea652583b8c5885fd01fe7280abe93bf1c6cfc370434f73
+DIST apcupsd-3.14.14.tar.gz 1843409 SHA256 db7748559b6b4c3784f9856561ef6ac6199ef7bd019b3edcd7e0a647bf8f9867 SHA512 c953bbf3e08f809748a7978a3952604176390d1cd276f187fe096d9bc3c8993b52127e8350c0363387da41318e24b4d1e00ea58df71f3bb8f50c9a5a64cd2d7f WHIRLPOOL 9b50390558b3a6192a631ff3dce398d947fb19123969604d2a89ff69a2373beff6a62c314ce351caeb9d9b736fcb8d622a75899166a3710c4c557c5a841c5adc
 DIST apcupsd-3.14.8.tar.gz 1317601 SHA256 8e7f2574d3abaf6637da3e790860c3f9ba64fab1ec7e50bb080de4439441c5a7 SHA512 07e6a15538bf1824b5063a1a93f33231639cf962e658c0dada1b244f2554af81824825d807ea81fd0388e25ed8fac0957621bfded96e3faeb7b594548fc4d418 WHIRLPOOL e5a580afc4955a373f020cb6e4ccbf07f9f020d4c15eaae59b416499c25a00b9d4bbc6af012bd2529024e8a3668a1d7c47f19f1bcb99f5ba60dc0108fa13c4f2

diff --git a/sys-power/apcupsd/apcupsd-3.14.14.ebuild b/sys-power/apcupsd/apcupsd-3.14.14.ebuild
new file mode 100644
index 00000000..22b9887
--- /dev/null
+++ b/sys-power/apcupsd/apcupsd-3.14.14.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils linux-info flag-o-matic systemd udev
+
+DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
+HOMEPAGE="http://www.apcupsd.org/"
+SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+IUSE="snmp +usb cgi nls gnome kernel_linux"
+
+DEPEND="
+	||	( >=sys-apps/util-linux-2.23[tty-helpers(-)]
+		  sys-freebsd/freebsd-ubin
+		)
+	cgi? ( >=media-libs/gd-1.8.4 )
+	nls? ( sys-devel/gettext )
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	gnome? ( >=x11-libs/gtk+-2.4.0:2
+		dev-libs/glib:2
+		>=gnome-base/gconf-2.0 )"
+RDEPEND="${DEPEND}
+	virtual/mailx"
+
+CONFIG_CHECK="~USB_HIDDEV ~HIDRAW"
+ERROR_USB_HIDDEV="CONFIG_USB_HIDDEV:	needed to access USB-attached UPSes"
+ERROR_HIDRAW="CONFIG_HIDRAW:		needed to access USB-attached UPSes"
+
+pkg_setup() {
+	if use kernel_linux && use usb && linux_config_exists; then
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.14.9-aliasing.patch"
+}
+
+src_configure() {
+	local myconf
+	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=/usr/libexec/${PN}/cgi-bin"
+	if use usb; then
+		myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --with-dev= "
+	else
+		myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --disable-usb"
+	fi
+
+	# We force the DISTNAME to gentoo so it will use gentoo's layout also
+	# when installed on non-linux systems.
+	econf \
+		--sbindir=/sbin \
+		--sysconfdir=/etc/apcupsd \
+		--with-pwrfail-dir=/etc/apcupsd \
+		--with-lock-dir=/run/apcupsd \
+		--with-pid-dir=/run/apcupsd \
+		--with-log-dir=/var/log \
+		--with-nis-port=3551 \
+		--enable-net --enable-pcnet \
+		--with-distname=gentoo \
+		$(use_enable snmp) \
+		$(use_enable gnome gapcmon) \
+		${myconf} \
+		APCUPSD_MAIL=/bin/mail
+}
+
+src_compile() {
+	# Workaround for bug #280674; upstream should really just provide
+	# the text files in the distribution, but I wouldn't count on them
+	# doing that anytime soon.
+	MANPAGER=$(type -p cat) \
+		emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -f "${D}"/etc/init.d/halt
+
+	insinto /etc/apcupsd
+	newins examples/safe.apccontrol safe.apccontrol
+	doins "${FILESDIR}"/apcupsd.conf
+
+	dodoc ChangeLog* ReleaseNotes
+	doman doc/*.8 doc/*.5
+
+	dohtml -r doc/manual/*
+
+	rm "${D}"/etc/init.d/apcupsd
+	newinitd "${FILESDIR}/${PN}.init.4" "${PN}"
+	newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}-tmpfiles.conf
+
+	# remove hal settings, we don't really want to have it around still.
+	rm -r "${D}"/usr/share/hal
+
+	# replace it with our udev rules if we're in Linux
+	if use kernel_linux; then
+		udev_newrules "${FILESDIR}"/apcupsd-udev.rules 60-${PN}.rules
+	fi
+
+}
+
+pkg_postinst() {
+	if use cgi; then
+		elog "The cgi-bin directory for ${PN} is /usr/libexec/${PN}/cgi-bin."
+		elog "Set up your ScriptAlias or symbolic links accordingly."
+	fi
+
+	elog ""
+	elog "Since version 3.14.0 you can use multiple apcupsd instances to"
+	elog "control more than one UPS in a single box with openRC."
+	elog "To do this, create a link between /etc/init.d/apcupsd to a new"
+	elog "/etc/init.d/apcupsd.something, and it will then load the"
+	elog "configuration file at /etc/apcupsd/something.conf."
+	elog ""
+
+	elog 'If you want apcupsd to power off your UPS when it'
+	elog 'shuts down your system in a power failure, you must'
+	elog 'add apcupsd.powerfail to your shutdown runlevel:'
+	elog ''
+	elog ' \e[01m rc-update add apcupsd.powerfail shutdown \e[0m'
+	elog ''
+
+	if use kernel_linux; then
+		elog "Starting from version 3.14.9-r1, ${PN} installs udev rules"
+		elog "for persistent device naming. If you have multiple UPS"
+		elog "connected to the machine, you can point them to the devices"
+		elog "in /dev/apcups/by-id directory."
+	fi
+}


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2016-09-28  8:55 Kristian Fiskerstrand
  0 siblings, 0 replies; 30+ messages in thread
From: Kristian Fiskerstrand @ 2016-09-28  8:55 UTC (permalink / raw
  To: gentoo-commits

commit:     14db1234b02169fec3af661b0850e32439fe202c
Author:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 08:53:52 2016 +0000
Commit:     Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 08:55:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14db1234

sys-power/apcupsd: Adding myself as maintainer

As agreed with Poly-C on IRC, adding myself as maintainer

Package-Manager: portage-2.3.1

 sys-power/apcupsd/metadata.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/sys-power/apcupsd/metadata.xml b/sys-power/apcupsd/metadata.xml
index d1e55f9..de7a495 100644
--- a/sys-power/apcupsd/metadata.xml
+++ b/sys-power/apcupsd/metadata.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<maintainer type="person">
+		<email>k_f@gentoo.org</email>
+		<name>Kristian Fiskerstrand</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 <longdescription lang="en">
 Apcupsd can be used for power mangement and controlling most of 
 APC's UPS models on Unix and Windows machines. Apcupsd works with 


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2016-08-06  9:16 Pacho Ramos
  0 siblings, 0 replies; 30+ messages in thread
From: Pacho Ramos @ 2016-08-06  9:16 UTC (permalink / raw
  To: gentoo-commits

commit:     4e133c3e9ecfb9397a80aafcd51e16a6800bd614
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  6 09:00:37 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Aug  6 09:16:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e133c3e

sys-power/apcupsd: Cleanup per bug #66633

Package-Manager: portage-2.3.0

 sys-power/apcupsd/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sys-power/apcupsd/metadata.xml b/sys-power/apcupsd/metadata.xml
index d95361c..d1e55f9 100644
--- a/sys-power/apcupsd/metadata.xml
+++ b/sys-power/apcupsd/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>mattm@gentoo.org</email>
-</maintainer>
 <maintainer type="project">
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2016-06-06 13:33 Agostino Sarubbo
  0 siblings, 0 replies; 30+ messages in thread
From: Agostino Sarubbo @ 2016-06-06 13:33 UTC (permalink / raw
  To: gentoo-commits

commit:     df90524285cac0baf58b827c610f887eda92c008
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 13:32:52 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 13:32:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df905242

sys-power/apcupsd: amd64 stable wrt bug #565608

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 sys-power/apcupsd/apcupsd-3.14.13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-power/apcupsd/apcupsd-3.14.13.ebuild b/sys-power/apcupsd/apcupsd-3.14.13.ebuild
index ce3e408..fe9716c 100644
--- a/sys-power/apcupsd/apcupsd-3.14.13.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ~x86 ~x86-fbsd"
 IUSE="snmp +usb cgi nls gnome kernel_linux"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/
@ 2015-12-22 12:07 Lars Wendler
  0 siblings, 0 replies; 30+ messages in thread
From: Lars Wendler @ 2015-12-22 12:07 UTC (permalink / raw
  To: gentoo-commits

commit:     d2f026a3480457d00c8e6f8acfc4431892275dad
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 22 12:04:17 2015 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Dec 22 12:04:17 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f026a3

sys-power/apcupsd: Bump to version 3.14.13

Package-Manager: portage-2.2.26
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-power/apcupsd/Manifest               |   1 +
 sys-power/apcupsd/apcupsd-3.14.13.ebuild | 139 +++++++++++++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 4758a56..e186bcc 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -1,3 +1,4 @@
 DIST apcupsd-3.14.10.tar.gz 1336852 SHA256 0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032 SHA512 f95918bff783cb60fa40b03a532ee7447293b0542f44f2f9ecf36ee028df3aa414f01e2b834a28fc319d88ec2e84c81314cd546b5628554176f2ca47fdc66bbc WHIRLPOOL 1fb40a5199eb8dfcd287bab08c2bbf51f02a3657ba615e16395d5f377bc9a5b6144db24b83ef5e9172ff970a715f87f685118a035c00372c34702984fac02d38
 DIST apcupsd-3.14.12.tar.gz 2014699 SHA256 1b4f703cb19cfdf44daf173dc8394cafd30fee0b30a0c75a7d19db622454a440 SHA512 2ed409ce4c7c7af667cecf0c73c47315d7516c696383c811945ead720afc146fe2ceda0efef722c3208a1b41a7d4661c9544bc4fe37a36ca4779a5dc1621f3d4 WHIRLPOOL 13a2491e4ad5446ba91a075f7408e48e94a35885288c9ee6108891d89412be5c81f69f4ab5064f86b8bece8c0de44357e4c378d05aad5d9d27bd85f0d95a83d5
+DIST apcupsd-3.14.13.tar.gz 1935043 SHA256 57ecbde01d0448bf8c4dbfe0ad016724ae66ab98adf2de955bf2be553c5d03f9 SHA512 74f7763de268626e24f9dd99090b01d5bff35c2fde769039104105ec27941673d1613c41fcac11e3d97d2fe5c364bcc0459847fcba5d2f7f1aac85795d6d8570 WHIRLPOOL 4b6fb18848aa597bae1066a7f195747f9edfdee75a27e43e3d14e3153d4b434829c5863b7e92c0704ea652583b8c5885fd01fe7280abe93bf1c6cfc370434f73
 DIST apcupsd-3.14.8.tar.gz 1317601 SHA256 8e7f2574d3abaf6637da3e790860c3f9ba64fab1ec7e50bb080de4439441c5a7 SHA512 07e6a15538bf1824b5063a1a93f33231639cf962e658c0dada1b244f2554af81824825d807ea81fd0388e25ed8fac0957621bfded96e3faeb7b594548fc4d418 WHIRLPOOL e5a580afc4955a373f020cb6e4ccbf07f9f020d4c15eaae59b416499c25a00b9d4bbc6af012bd2529024e8a3668a1d7c47f19f1bcb99f5ba60dc0108fa13c4f2

diff --git a/sys-power/apcupsd/apcupsd-3.14.13.ebuild b/sys-power/apcupsd/apcupsd-3.14.13.ebuild
new file mode 100644
index 0000000..ce3e408
--- /dev/null
+++ b/sys-power/apcupsd/apcupsd-3.14.13.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils linux-info flag-o-matic systemd udev
+
+DESCRIPTION="APC UPS daemon with integrated tcp/ip remote shutdown"
+HOMEPAGE="http://www.apcupsd.org/"
+SRC_URI="mirror://sourceforge/apcupsd/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+IUSE="snmp +usb cgi nls gnome kernel_linux"
+
+DEPEND="
+	||	( >=sys-apps/util-linux-2.23[tty-helpers(-)]
+		  <=sys-apps/sysvinit-2.88-r4
+		  sys-freebsd/freebsd-ubin
+		)
+	cgi? ( >=media-libs/gd-1.8.4 )
+	nls? ( sys-devel/gettext )
+	snmp? ( >=net-analyzer/net-snmp-5.7.2 )
+	gnome? ( >=x11-libs/gtk+-2.4.0:2
+		dev-libs/glib:2
+		>=gnome-base/gconf-2.0 )"
+RDEPEND="${DEPEND}
+	sys-apps/openrc
+	virtual/mailx"
+
+CONFIG_CHECK="~USB_HIDDEV ~HIDRAW"
+ERROR_USB_HIDDEV="CONFIG_USB_HIDDEV:	needed to access USB-attached UPSes"
+ERROR_HIDRAW="CONFIG_HIDRAW:		needed to access USB-attached UPSes"
+
+pkg_setup() {
+	if use kernel_linux && use usb && linux_config_exists; then
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.14.9-aliasing.patch"
+}
+
+src_configure() {
+	local myconf
+	use cgi && myconf="${myconf} --enable-cgi --with-cgi-bin=/usr/libexec/${PN}/cgi-bin"
+	if use usb; then
+		myconf="${myconf} --with-upstype=usb --with-upscable=usb --enable-usb --with-dev= "
+	else
+		myconf="${myconf} --with-upstype=apcsmart --with-upscable=smart --disable-usb"
+	fi
+
+	# We force the DISTNAME to gentoo so it will use gentoo's layout also
+	# when installed on non-linux systems.
+	econf \
+		--sbindir=/sbin \
+		--sysconfdir=/etc/apcupsd \
+		--with-pwrfail-dir=/etc/apcupsd \
+		--with-lock-dir=/run/apcupsd \
+		--with-pid-dir=/run/apcupsd \
+		--with-log-dir=/var/log \
+		--with-nis-port=3551 \
+		--enable-net --enable-pcnet \
+		--with-distname=gentoo \
+		$(use_enable snmp net-snmp) \
+		$(use_enable gnome gapcmon) \
+		${myconf} \
+		APCUPSD_MAIL=/bin/mail
+}
+
+src_compile() {
+	# Workaround for bug #280674; upstream should really just provide
+	# the text files in the distribution, but I wouldn't count on them
+	# doing that anytime soon.
+	MANPAGER=$(type -p cat) \
+		emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	rm -f "${D}"/etc/init.d/halt
+
+	insinto /etc/apcupsd
+	newins examples/safe.apccontrol safe.apccontrol
+	doins "${FILESDIR}"/apcupsd.conf
+
+	dodoc ChangeLog* ReleaseNotes
+	doman doc/*.8 doc/*.5
+
+	dohtml -r doc/manual/*
+
+	rm "${D}"/etc/init.d/apcupsd
+	newinitd "${FILESDIR}/${PN}.init.4" "${PN}"
+	newinitd "${FILESDIR}/${PN}.powerfail.init" "${PN}".powerfail
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_dotmpfilesd "${FILESDIR}"/${PN}-tmpfiles.conf
+
+	# remove hal settings, we don't really want to have it around still.
+	rm -r "${D}"/usr/share/hal
+
+	# replace it with our udev rules if we're in Linux
+	if use kernel_linux; then
+		udev_newrules "${FILESDIR}"/apcupsd-udev.rules 60-${PN}.rules
+	fi
+
+}
+
+pkg_postinst() {
+	if use cgi; then
+		elog "The cgi-bin directory for ${PN} is /usr/libexec/${PN}/cgi-bin."
+		elog "Set up your ScriptAlias or symbolic links accordingly."
+	fi
+
+	elog ""
+	elog "Since version 3.14.0 you can use multiple apcupsd instances to"
+	elog "control more than one UPS in a single box with openRC."
+	elog "To do this, create a link between /etc/init.d/apcupsd to a new"
+	elog "/etc/init.d/apcupsd.something, and it will then load the"
+	elog "configuration file at /etc/apcupsd/something.conf."
+	elog ""
+
+	elog 'If you want apcupsd to power off your UPS when it'
+	elog 'shuts down your system in a power failure, you must'
+	elog 'add apcupsd.powerfail to your shutdown runlevel:'
+	elog ''
+	elog ' \e[01m rc-update add apcupsd.powerfail shutdown \e[0m'
+	elog ''
+
+	if use kernel_linux; then
+		elog "Starting from version 3.14.9-r1, ${PN} installs udev rules"
+		elog "for persistent device naming. If you have multiple UPS"
+		elog "connected to the machine, you can point them to the devices"
+		elog "in /dev/apcups/by-id directory."
+	fi
+}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

end of thread, other threads:[~2023-06-28  7:55 UTC | newest]

Thread overview: 30+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-09  9:52 [gentoo-commits] repo/gentoo:master commit in: sys-power/apcupsd/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2023-06-28  7:55 Sam James
2023-04-03 17:40 Jakov Smolić
2022-07-11 15:03 David Seifert
2022-01-04 10:30 David Seifert
2021-09-15  2:34 Sam James
2021-09-03  1:53 Sam James
2021-05-13 21:17 Sam James
2021-05-13 18:56 Sam James
2021-05-13 17:10 Sam James
2021-04-01 22:23 Thomas Deutschmann
2021-03-07 16:45 David Seifert
2021-03-07 11:58 David Seifert
2020-05-06 17:25 Michał Górny
2018-10-01 14:04 Sergey Popov
2018-09-26 15:07 Sergey Popov
2018-08-26 20:35 Michał Górny
2018-03-14 19:19 Mikle Kolyada
2018-01-07 23:38 Mikle Kolyada
2018-01-07 14:23 Sergei Trofimovich
2017-11-26 23:26 David Seifert
2016-11-23 20:52 Kristian Fiskerstrand
2016-11-18 23:39 Kristian Fiskerstrand
2016-09-28 21:17 Kristian Fiskerstrand
2016-09-28 21:11 Kristian Fiskerstrand
2016-09-28 21:11 Kristian Fiskerstrand
2016-09-28  8:55 Kristian Fiskerstrand
2016-08-06  9:16 Pacho Ramos
2016-06-06 13:33 Agostino Sarubbo
2015-12-22 12:07 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox