Depend on gtk20/gnomehier and stop caring of extra dirs in pkg-plist.

Suggested by:	netchild, mezz

5 files changed, 4 insertions, 16 deletions

diff --git a/x11-themes/gtk-aluminumalloy-cryogenic-theme/pkg-plist b/x11-themes/gtk-aluminumalloy-cryogenic-theme/pkg-plist
index 2e2058ea880..ba40a05d1d5 100644
--- a/x11-themes/gtk-aluminumalloy-cryogenic-theme/pkg-plist
+++ b/x11-themes/gtk-aluminumalloy-cryogenic-theme/pkg-plist
@@ -226,7 +226,6 @@
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Cryogenic/gtk-2.0/icons
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Cryogenic/gtk-2.0
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Cryogenic
-%%GTK20%%@unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true
 %%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/title-bar.png
 %%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/title-bar-inactive.png
 %%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/text_right.png
@@ -253,5 +252,3 @@
 %%METACITY%%share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1/button-close-focus.png
 %%METACITY%%@dirrm share/gnome/themes/AluminumAlloy-Cryogenic/metacity-1
 %%METACITY%%@dirrm share/gnome/themes/AluminumAlloy-Cryogenic
-%%METACITY%%@unexec /bin/rmdir %D/share/gnome/themes 2>/dev/null || /usr/bin/true
-%%METACITY%%@unexec /bin/rmdir %D/share/gnome 2>/dev/null || /usr/bin/true
diff --git a/x11-themes/gtk-aluminumalloy-smog-theme/pkg-plist b/x11-themes/gtk-aluminumalloy-smog-theme/pkg-plist
index 3bdc24a42cc..4090bbe9b70 100644
--- a/x11-themes/gtk-aluminumalloy-smog-theme/pkg-plist
+++ b/x11-themes/gtk-aluminumalloy-smog-theme/pkg-plist
@@ -230,7 +230,6 @@
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Smog/gtk-2.0/icons
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Smog/gtk-2.0
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Smog
-%%GTK20%%@unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true
 %%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/title-bar.png
 %%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/title-bar-inactive.png
 %%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/text_right.png
@@ -257,5 +256,3 @@
 %%METACITY%%share/gnome/themes/AluminumAlloy-Smog/metacity-1/button-close-focus.png
 %%METACITY%%@dirrm share/gnome/themes/AluminumAlloy-Smog/metacity-1
 %%METACITY%%@dirrm share/gnome/themes/AluminumAlloy-Smog
-%%METACITY%%@unexec /bin/rmdir %D/share/gnome/themes 2>/dev/null || /usr/bin/true
-%%METACITY%%@unexec /bin/rmdir %D/share/gnome 2>/dev/null || /usr/bin/true
diff --git a/x11-themes/gtk-aluminumalloy-toxic-theme/pkg-plist b/x11-themes/gtk-aluminumalloy-toxic-theme/pkg-plist
index f29d9ec447d..2ad2f4992b3 100644
--- a/x11-themes/gtk-aluminumalloy-toxic-theme/pkg-plist
+++ b/x11-themes/gtk-aluminumalloy-toxic-theme/pkg-plist
@@ -226,7 +226,6 @@
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Toxic/gtk-2.0/icons
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Toxic/gtk-2.0
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Toxic
-%%GTK20%%@unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true
 %%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/title-bar.png
 %%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/title-bar-inactive.png
 %%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/text_right.png
@@ -253,5 +252,3 @@
 %%METACITY%%share/gnome/themes/AluminumAlloy-Toxic/metacity-1/button-close-focus.png
 %%METACITY%%@dirrm share/gnome/themes/AluminumAlloy-Toxic/metacity-1
 %%METACITY%%@dirrm share/gnome/themes/AluminumAlloy-Toxic
-%%METACITY%%@unexec /bin/rmdir %D/share/gnome/themes 2>/dev/null || /usr/bin/true
-%%METACITY%%@unexec /bin/rmdir %D/share/gnome 2>/dev/null || /usr/bin/true
diff --git a/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile b/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile
index 3828f89a583..cb7e1ae216a 100644
--- a/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile
+++ b/x11-themes/gtk-aluminumalloy-volcanic-theme/Makefile
@@ -28,12 +28,12 @@ NO_BUILD=	yes
 
 .if ${TYPE} == "gtk"
 THEME_DIR=	${PREFIX}/share/themes/${THEME_NAME}
-PLIST_SUB+=	GTK20=""
-PLIST_SUB+=	METACITY="@comment "
+PLIST_SUB+=	GTK20="" METACITY="@comment "
+USE_GNOME=	gtk20
 .else	# metacity
 THEME_DIR=	${PREFIX}/share/gnome/themes/${THEME_NAME}
-PLIST_SUB+=	GTK20="@comment "
-PLIST_SUB+=	METACITY=""
+PLIST_SUB+=	GTK20="@comment " METACITY=""
+USE_GNOME=	gnomehier
 .endif
 
 do-install:
diff --git a/x11-themes/gtk-aluminumalloy-volcanic-theme/pkg-plist b/x11-themes/gtk-aluminumalloy-volcanic-theme/pkg-plist
index a4d79ac7db6..d5a7a06b336 100644
--- a/x11-themes/gtk-aluminumalloy-volcanic-theme/pkg-plist
+++ b/x11-themes/gtk-aluminumalloy-volcanic-theme/pkg-plist
@@ -227,7 +227,6 @@
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Volcanic/gtk-2.0/icons
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Volcanic/gtk-2.0
 %%GTK20%%@dirrm share/themes/AluminumAlloy-Volcanic
-%%GTK20%%@unexec /bin/rmdir %D/share/themes 2>/dev/null || /usr/bin/true
 %%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/title-bar.png
 %%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/title-bar-inactive.png
 %%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/text_right.png
@@ -254,5 +253,3 @@
 %%METACITY%%share/gnome/themes/AluminumAlloy-Volcanic/metacity-1/button-close-focus.png
 %%METACITY%%@dirrm share/gnome/themes/AluminumAlloy-Volcanic/metacity-1
 %%METACITY%%@dirrm share/gnome/themes/AluminumAlloy-Volcanic
-%%METACITY%%@unexec /bin/rmdir %D/share/gnome/themes 2>/dev/null || /usr/bin/true
-%%METACITY%%@unexec /bin/rmdir %D/share/gnome 2>/dev/null || /usr/bin/true