x11-themes/fvwm-crystal: Avoid USE which does not change installed data

3 files changed, 8 insertions, 21 deletions

diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.4.1.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.4.1.ebuild
index 7fe39468..5d31cfc2 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.4.1.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.4.1.ebuild
@@ -16,7 +16,6 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="+amixer jack +pm-utils +xdg"
 
 case ${PV} in
 *9999)
@@ -43,15 +42,12 @@ RDEPEND="${PYTHON_DEPS}
 	sys-devel/bc
 	virtual/awk
 	x11-apps/xwd
-	xdg? ( x11-misc/xdg-user-dirs )
-	pm-utils? ( sys-power/pm-utils )
-	amixer? ( media-sound/alsa-utils )
-	jack? ( media-sound/jack-audio-connection-kit )"
+	media-sound/alsa-utils"
 
 DISABLE_AUTOFORMATTING="true"
 DOC_CONTENTS="After installation, execute the following commands:
-\ \$ cp -r "${EROOT}"usr/share/doc/"${PF}"/addons/Xresources ~/.Xresources
-\ \$ cp -r "${EROOT}"usr/share/doc/"${PF}"/addons/Xsession ~/.xinitrc
+	\$ cp -r "${EROOT}"usr/share/doc/"${PF}"/addons/Xresources ~/.Xresources
+	\$ cp -r "${EROOT}"usr/share/doc/"${PF}"/addons/Xsession ~/.xinitrc
 
 Many applications can extend functionality of fvwm-crystal.
 They are listed in "${EROOT}"usr/share/doc/"${PF}"/INSTALL.*
@@ -59,7 +55,7 @@ They are listed in "${EROOT}"usr/share/doc/"${PF}"/INSTALL.*
 To be able to use the exit menu, each user using ${PN}
 must be in the group fvwm-crystal.
 You can do that as root with:
-	useradd -G fvwm-crystal <user_name>
+	\$ useradd -G fvwm-crystal <user_name>
 and log out and in again.
 "
 
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-99999999.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-99999999.ebuild
index 7fe39468..5d31cfc2 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-99999999.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-99999999.ebuild
@@ -16,7 +16,6 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="+amixer jack +pm-utils +xdg"
 
 case ${PV} in
 *9999)
@@ -43,15 +42,12 @@ RDEPEND="${PYTHON_DEPS}
 	sys-devel/bc
 	virtual/awk
 	x11-apps/xwd
-	xdg? ( x11-misc/xdg-user-dirs )
-	pm-utils? ( sys-power/pm-utils )
-	amixer? ( media-sound/alsa-utils )
-	jack? ( media-sound/jack-audio-connection-kit )"
+	media-sound/alsa-utils"
 
 DISABLE_AUTOFORMATTING="true"
 DOC_CONTENTS="After installation, execute the following commands:
-\ \$ cp -r "${EROOT}"usr/share/doc/"${PF}"/addons/Xresources ~/.Xresources
-\ \$ cp -r "${EROOT}"usr/share/doc/"${PF}"/addons/Xsession ~/.xinitrc
+	\$ cp -r "${EROOT}"usr/share/doc/"${PF}"/addons/Xresources ~/.Xresources
+	\$ cp -r "${EROOT}"usr/share/doc/"${PF}"/addons/Xsession ~/.xinitrc
 
 Many applications can extend functionality of fvwm-crystal.
 They are listed in "${EROOT}"usr/share/doc/"${PF}"/INSTALL.*
@@ -59,7 +55,7 @@ They are listed in "${EROOT}"usr/share/doc/"${PF}"/INSTALL.*
 To be able to use the exit menu, each user using ${PN}
 must be in the group fvwm-crystal.
 You can do that as root with:
-	useradd -G fvwm-crystal <user_name>
+	\$ useradd -G fvwm-crystal <user_name>
 and log out and in again.
 "
 
diff --git a/x11-themes/fvwm-crystal/metadata.xml b/x11-themes/fvwm-crystal/metadata.xml
index b3a5acd2..c08873ec 100644
--- a/x11-themes/fvwm-crystal/metadata.xml
+++ b/x11-themes/fvwm-crystal/metadata.xml
@@ -29,9 +29,4 @@ with additional programs and scripts. Some of it's features are:
   <upstream>
     <remote-id type="sourceforge">fvwm-crystal</remote-id>
   </upstream>
-<use>
-  <flag name="xdg">Enable xdg localized user directrories support via x11-misc/xdg-user-dirs</flag>
-  <flag name="amixer">Enable alsamixer support (alsa-sound/alsa-utils)</flag>
-  <flag name="pm-utils">Enable support for suspend/resume the system through sys-power/pm-utils</flag>
-</use>
 </pkgmetadata>