Update license. Update nss-myhostname dependency due to systemd-197 (bug #453026). Drop old.

(Portage version: 2.2.0_alpha158/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

3 files changed, 12 insertions, 59 deletions

diff --git a/app-admin/openrc-settingsd/ChangeLog b/app-admin/openrc-settingsd/ChangeLog
index 6a90349f20b6..46dc0792bcde 100644
--- a/app-admin/openrc-settingsd/ChangeLog
+++ b/app-admin/openrc-settingsd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/openrc-settingsd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/openrc-settingsd/ChangeLog,v 1.8 2013/01/06 09:11:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/openrc-settingsd/ChangeLog,v 1.9 2013/01/21 19:48:06 tetromino Exp $
+
+  21 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -openrc-settingsd-1.0.ebuild, openrc-settingsd-1.0.1.ebuild:
+  Update license. Update nss-myhostname dependency due to systemd-197 (bug
+  #453026). Drop old.
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> openrc-settingsd-1.0.1.ebuild:
   Add ~sparc, wrt bug #449220
diff --git a/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild b/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild
index ff0c8a7ada79..e98ce7b01de8 100644
--- a/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild
+++ b/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild,v 1.6 2013/01/06 09:11:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild,v 1.7 2013/01/21 19:48:06 tetromino Exp $
 
-EAPI=4
+EAPI=5
 
 DESCRIPTION="System settings D-Bus service for OpenRC"
 HOMEPAGE="http://gnome.gentoo.org/openrc-settingsd.xml"
 SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="systemd"
@@ -16,12 +16,11 @@ IUSE="systemd"
 COMMON_DEPEND=">=dev-libs/glib-2.30:2
 	dev-libs/libdaemon
 	sys-apps/dbus
-	sys-apps/openrc
+	sys-apps/openrc:=
 	sys-auth/polkit"
 RDEPEND="${COMMON_DEPEND}
-	sys-auth/nss-myhostname
-	systemd? ( sys-apps/systemd )
-	!systemd? ( !sys-apps/systemd )"
+	systemd? ( >=sys-apps/systemd-197 )
+	!systemd? ( sys-auth/nss-myhostname !sys-apps/systemd )"
 DEPEND="${COMMON_DEPEND}
 	app-arch/xz-utils
 	dev-util/gdbus-codegen
diff --git a/app-admin/openrc-settingsd/openrc-settingsd-1.0.ebuild b/app-admin/openrc-settingsd/openrc-settingsd-1.0.ebuild
deleted file mode 100644
index 363697b314e0..000000000000
--- a/app-admin/openrc-settingsd/openrc-settingsd-1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/openrc-settingsd/openrc-settingsd-1.0.ebuild,v 1.1 2012/09/07 16:20:23 tetromino Exp $
-
-EAPI=4
-
-DESCRIPTION="System settings D-Bus service for OpenRC"
-HOMEPAGE="http://gnome.gentoo.org/openrc-settingsd.xml"
-SRC_URI="http://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="systemd"
-
-COMMON_DEPEND=">=dev-libs/glib-2.30:2
-	dev-libs/libdaemon
-	sys-apps/dbus
-	sys-apps/openrc
-	sys-auth/polkit"
-RDEPEND="${COMMON_DEPEND}
-	sys-auth/nss-myhostname
-	systemd? ( sys-apps/systemd )
-	!systemd? ( !sys-apps/systemd )"
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	dev-util/gdbus-codegen
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--with-pidfile="${EPREFIX}"/var/run/openrc-settingsd.pid
-}
-
-src_install() {
-	default
-	if use systemd; then
-		# Avoid file collision with systemd
-		rm -vr "${ED}"usr/share/{dbus-1,polkit-1} "${ED}"etc/dbus-1 || die "rm failed"
-	fi
-}
-
-pkg_postinst() {
-	if use systemd; then
-		elog "You installed ${PN} with USE=systemd. In this mode,"
-		elog "${PN} will not start via simple dbus activation, so you"
-		elog "will have to manually enable it as an rc service:"
-		elog " # /etc/init.d/openrc-settingsd start"
-		elog " # rc-update add openrc-settingsd default"
-	fi
-}