Handle openrc_services more gracefully.

1) There's no need to specify the trigger anymore.
2) There's no need to add the OpenRC run dependency anymore.

Just specifying $openrc_services is enough.

--HG--
extra : convert_revision : 34e4d6d37a07a18837ef2216474ee0ca6fd55124

shutils/metadata.sh

@@ -274,6 +274,15 @@ xbps_write_metadata_pkg_real()
 <key>long_desc</key>
 <string>$long_desc</string>
 _EOF
+	#
+	# If package sets $openrc_services, add the openrc-service
+	# trigger and OpenRC run dependency.
+	#
+	if [ -n "$openrc_services" ]; then
+		triggers="$triggers openrc-service"
+		Add_dependency run OpenRC
+	fi
+
 	# Dependencies
 	if [ -n "$run_depends" ]; then
 		echo "<key>run_depends</key>" >> $TMPFPROPS

templates/cronie/template

@@ -17,12 +17,10 @@ long_desc="
 
 conf_files="/etc/crontab"
 openrc_services="crond default"
-triggers="openrc-service"
 
 Add_dependency full glibc
 Add_dependency full pam
 Add_dependency full run-parts
-Add_dependency run  OpenRC
 
 post_install()
 {

templates/dbus/template

@@ -25,13 +25,11 @@ keep_dirs="/etc/dbus-1"
 conf_files="/etc/dbus-1/session.conf /etc/dbus-1/system.conf"
 subpackages="devel libs"
 openrc_services="dbus default"
-triggers="openrc-service"
 
 Add_dependency full	glibc
 Add_dependency full	expat
 Add_dependency run	dbus-libs
 Add_dependency build	pkg-config
-Add_dependency run	OpenRC
 
 post_install()
 {

templates/dhcpcd/template

@@ -15,11 +15,9 @@ long_desc="
  configuration."
 
 Add_dependency run glibc
-Add_dependency run OpenRC
 
 conf_files="/etc/dhcpcd.conf"
 openrc_services="dhcpcd default"
-triggers="openrc-service"
 
 pre_configure()
 {

templates/hal/template

@@ -17,7 +17,6 @@ long_desc="
 conf_files="/etc/dbus-1/system.d/hal.conf
  /etc/hal/fdi/policy/10-keymap.fdi"
 openrc_services="hal default"
-triggers="openrc-service"
 
 Add_dependency full glibc
 Add_dependency full udev
@@ -36,7 +35,6 @@ Add_dependency full dmidecode
 Add_dependency build pkg-config
 Add_dependency build libsmbios
 Add_dependency run libsmbios-utils
-Add_dependency run OpenRC
 Add_dependency full pm-utils
 Add_dependency full libblkid
 

templates/metalog/template

@@ -15,13 +15,11 @@ long_desc="
 
 conf_files="/etc/metalog.conf"
 openrc_services="metalog default"
-triggers="openrc-service"
 
 Add_dependency full glibc
 Add_dependency full pcre
 Add_dependency full bzip2
 Add_dependency build lzma-utils
-Add_dependency run  OpenRC
 
 post_install()
 {

templates/nfs-utils/template

@@ -15,8 +15,6 @@ long_desc="
  traditional Linux NFS server used by most users."
 
 openrc_services="mountd default nfsd default nfslock default"
-triggers="openrc-service"
-
 conf_files="/etc/exports"
 
 Add_dependency full	glibc
@@ -24,7 +22,6 @@ Add_dependency full	portmap
 Add_dependency full	libblkid
 Add_dependency build	tcp_wrappers
 Add_dependency run	tcp_wrappers-libs
-Add_dependency run	OpenRC
 
 post_install()
 {

templates/ntp/template

@@ -20,13 +20,11 @@ long_desc="
 subpackages="perl"
 conf_files="/etc/ntp.conf"
 openrc_services="ntpd default"
-triggers="openrc-service"
 
 Add_dependency full glibc
 Add_dependency full openssl
 Add_dependency full libcap
 Add_dependency run  ncurses-libs
-Add_dependency run  OpenRC
 
 post_install()
 {

templates/portmap/template

@@ -15,12 +15,10 @@ long_desc="
  and NIS, and assorted other systems."
 
 openrc_services="portmap default"
-triggers="openrc-service"
 
 Add_dependency full	glibc
 Add_dependency build	tcp_wrappers
 Add_dependency run	tcp_wrappers-libs
-Add_dependency run	OpenRC
 
 post_install()
 {

templates/udev/template

@@ -14,11 +14,8 @@ long_desc="
  /sbin/hotplug. It requires a 2.5/2.6 kernel to run properly."
 
 openrc_services="udev sysinit"
-triggers="openrc-service"
-
 Add_dependency full glibc
 Add_dependency full procps
-Add_dependency full OpenRC
 
 post_install()
 {