net-misc/ntpsec: Replace USE_EXPANDish flags with normal ones

Signed-off-by: James Browning <JamesB.fe80@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>

4 files changed, 30 insertions, 36 deletions

diff --git a/net-misc/ntpsec/metadata.xml b/net-misc/ntpsec/metadata.xml
index 864309f6a22b..c7648d479a4a 100644
--- a/net-misc/ntpsec/metadata.xml
+++ b/net-misc/ntpsec/metadata.xml
@@ -12,21 +12,21 @@
 		<flag name="libbsd">Use libbsd instead of internal funcs</flag>
 		<flag name="nist">Set local clock deps</flag>
 		<flag name="ntpviz">Make visualizations of offsets, jiffies, etc.</flag>
-		<flag name="rclock_oncore">Oncore driver</flag>
-		<flag name="rclock_trimble">Trimble driver</flag>
-		<flag name="rclock_truetime">Trutime driver (deprecated)</flag>
-		<flag name="rclock_gpsd">Enable gpsd daemon support</flag>
-		<flag name="rclock_jjy">JJY driver</flag>
-		<flag name="rclock_generic">Enable support for generic time radios and GPSDOs</flag>
-		<flag name="rclock_spectracom">Spectracom driver</flag>
-		<flag name="rclock_shm">Obtain refclock info from shared memory-segment</flag>
-		<flag name="rclock_pps">PPS cesium clock driver</flag>
-		<flag name="rclock_hpgps">Hewlett Packard GPS driver</flag>
-		<flag name="rclock_zyfer">Zyfer driver</flag>
-		<flag name="rclock_arbiter">Arbiter 1088A/B GPS driver</flag>
-		<flag name="rclock_nmea">NMEA GPS driver</flag>
-		<flag name="rclock_modem">NIST/USNO/PTB Modem Time Services</flag>
-		<flag name="rclock_local">Support for undisciplined local clock (not recommended)</flag>
+		<flag name="oncore">Oncore driver</flag>
+		<flag name="trimble">Trimble driver</flag>
+		<flag name="truetime">Trutime driver (deprecated)</flag>
+		<flag name="gpsd">Enable gpsd daemon support</flag>
+		<flag name="jjy">JJY driver</flag>
+		<flag name="generic">Enable support for generic time radios and GPSDOs</flag>
+		<flag name="spectracom">Spectracom driver</flag>
+		<flag name="shm">Obtain refclock info from shared memory-segment</flag>
+		<flag name="pps">PPS cesium clock driver</flag>
+		<flag name="hpgps">Hewlett Packard GPS driver</flag>
+		<flag name="zyfer">Zyfer driver</flag>
+		<flag name="arbiter">Arbiter 1088A/B GPS driver</flag>
+		<flag name="nmea">NMEA GPS driver</flag>
+		<flag name="modem">NIST/USNO/PTB Modem Time Services</flag>
+		<flag name="local">Support for undisciplined local clock (not recommended)</flag>
 		<flag name="smear">Specify the interval over which a leap second is applied (experimental)</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-misc/ntpsec/ntpsec-1.2.2a.ebuild b/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
index 52c1058a3b2e..95735be7c7bf 100644
--- a/net-misc/ntpsec/ntpsec-1.2.2a.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild
@@ -36,10 +36,8 @@ NTPSEC_REFCLOCK=(
 	shm pps hpgps zyfer arbiter nmea modem local
 )
 
-IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
-
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
+IUSE="${NTPSEC_REFCLOCK[@]} debug doc early gdb heat libbsd nist ntpviz samba seccomp smear" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( local )"
 
 # net-misc/pps-tools oncore,pps
 DEPEND="
@@ -49,8 +47,8 @@ DEPEND="
 	sys-libs/libcap
 	libbsd? ( dev-libs/libbsd:0= )
 	seccomp? ( sys-libs/libseccomp )
-	rclock_oncore? ( net-misc/pps-tools )
-	rclock_pps? ( net-misc/pps-tools )
+	oncore? ( net-misc/pps-tools )
+	pps? ( net-misc/pps-tools )
 "
 RDEPEND="
 	${DEPEND}
@@ -99,7 +97,7 @@ src_configure() {
 	local CLOCKSTRING=""
 
 	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
-		if use rclock_${refclock} ; then
+		if use ${refclock} ; then
 			string_127+="$refclock,"
 		fi
 	done
diff --git a/net-misc/ntpsec/ntpsec-1.2.3.ebuild b/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
index 29d8829e72d7..a2c87b866336 100644
--- a/net-misc/ntpsec/ntpsec-1.2.3.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild
@@ -36,10 +36,8 @@ NTPSEC_REFCLOCK=(
 	shm pps hpgps zyfer arbiter nmea modem local
 )
 
-IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
-
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early heat libbsd nist ntpviz samba seccomp smear" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
+IUSE="${NTPSEC_REFCLOCK[@]} debug doc early heat libbsd nist ntpviz samba seccomp smear" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( local )"
 
 # net-misc/pps-tools oncore,pps
 DEPEND="
@@ -49,8 +47,8 @@ DEPEND="
 	sys-libs/libcap
 	libbsd? ( dev-libs/libbsd:0= )
 	seccomp? ( sys-libs/libseccomp )
-	rclock_oncore? ( net-misc/pps-tools )
-	rclock_pps? ( net-misc/pps-tools )
+	oncore? ( net-misc/pps-tools )
+	pps? ( net-misc/pps-tools )
 "
 RDEPEND="
 	${DEPEND}
@@ -99,7 +97,7 @@ src_configure() {
 	local CLOCKSTRING=""
 
 	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
-		if use rclock_${refclock} ; then
+		if use ${refclock} ; then
 			string_127+="$refclock,"
 		fi
 	done
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index ca1b744563fb..68b047560c2a 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -36,10 +36,8 @@ NTPSEC_REFCLOCK=(
 	shm pps hpgps zyfer arbiter nmea modem local
 )
 
-IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
-
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early heat libbsd nist ntpviz samba seccomp smear" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
+IUSE="${NTPSEC_REFCLOCK[@]} debug doc early heat libbsd nist ntpviz samba seccomp smear" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( local )"
 
 # net-misc/pps-tools oncore,pps
 DEPEND="
@@ -49,8 +47,8 @@ DEPEND="
 	sys-libs/libcap
 	libbsd? ( dev-libs/libbsd:0= )
 	seccomp? ( sys-libs/libseccomp )
-	rclock_oncore? ( net-misc/pps-tools )
-	rclock_pps? ( net-misc/pps-tools )
+	oncore? ( net-misc/pps-tools )
+	pps? ( net-misc/pps-tools )
 "
 RDEPEND="
 	${DEPEND}
@@ -99,7 +97,7 @@ src_configure() {
 	local CLOCKSTRING=""
 
 	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
-		if use rclock_${refclock} ; then
+		if use ${refclock} ; then
 			string_127+="$refclock,"
 		fi
 	done