From 25f17be082560cc669e54ceaae36e55c294eaec4 Mon Sep 17 00:00:00 2001
From: hasufell <hasufell@hasufell.de>
Date: Mon, 15 Feb 2016 02:28:44 +0100
Subject: [PATCH] media-sound/pnmixer: moved from x11-apps/ and properly
 updated

---
 metadata/categories.conf                      |  1 +
 metadata/repository_mask.conf                 |  1 +
 .../media-sound/pnmixer/pnmixer-scm.exheres-0 | 40 ++++++++++++++
 .../x11-apps/pnmixer/pnmixer-scm.exheres-0    | 53 -------------------
 4 files changed, 42 insertions(+), 53 deletions(-)
 create mode 100644 packages/media-sound/pnmixer/pnmixer-scm.exheres-0
 delete mode 100644 packages/x11-apps/pnmixer/pnmixer-scm.exheres-0

diff --git a/metadata/categories.conf b/metadata/categories.conf
index 1d31b936..30075a5d 100644
--- a/metadata/categories.conf
+++ b/metadata/categories.conf
@@ -5,6 +5,7 @@ dev-util
 games-board
 games-rpg
 games-strategy
+media-sound
 net-misc
 net-www
 sci-mathematics
diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
index 178ee7c5..32a6a675 100644
--- a/metadata/repository_mask.conf
+++ b/metadata/repository_mask.conf
@@ -1,5 +1,6 @@
 (
     x11-wm/i3[~scm]
+    media-sound/pnmixer[~scm]
 ) [[
     *author = [ Julian Ospald <hasufell@posteo.de> ]
     *token = scm
diff --git a/packages/media-sound/pnmixer/pnmixer-scm.exheres-0 b/packages/media-sound/pnmixer/pnmixer-scm.exheres-0
new file mode 100644
index 00000000..8bf60cb4
--- /dev/null
+++ b/packages/media-sound/pnmixer/pnmixer-scm.exheres-0
@@ -0,0 +1,40 @@
+# Copyright 2015 Kylie McClain <somasis@exherbo.org>
+# Copyright 2016 Julian Ospald <hasufell@posteo.de>
+# Distributed under the terms of the GNU General Public License v2
+
+require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
+require github [ user='nicklan' ]
+
+SUMMARY="Simple ALSA mixer application designed to run in system tray"
+SLOT="0"
+LICENCES="GPL-3"
+
+MYOPTIONS="
+    libnotify
+    ( providers: gtk2 gtk3 ) [[ number-selected = exactly-one ]]
+"
+
+PLATFORMS="~amd64"
+
+DEPENDENCIES="
+    build:
+        dev-util/intltool
+        sys-devel/gettext
+    build+run:
+        dev-libs/glib:2
+        sys-sound/alsa-lib
+        x11-libs/libX11
+        libnotify? ( x11-libs/libnotify )
+        providers:gtk2? ( x11-libs/gtk+:2[>=2.16.0] )
+        providers:gtk3? ( x11-libs/gtk+:3[>=3.6.0] )
+"
+
+DEFAULT_SRC_CONFIGURE_OPTION_WITHS=(
+    libnotify
+    'providers:gtk3 gtk3'
+)
+
+src_prepare() {
+    edo intltoolize --force --copy
+    autotools_src_prepare
+}
diff --git a/packages/x11-apps/pnmixer/pnmixer-scm.exheres-0 b/packages/x11-apps/pnmixer/pnmixer-scm.exheres-0
deleted file mode 100644
index 2e024228..00000000
--- a/packages/x11-apps/pnmixer/pnmixer-scm.exheres-0
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2014 Julian Ospald <hasufell@posteo.de>
-# Distributed under the terms of the GNU General Public License v2
-
-require github [ user=nicklan ] autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.13 ] ] gtk-icon-cache
-
-SUMMARY="Volume mixer for the system tray"
-HOMEPAGE="https://github.com/nicklan/pnmixer"
-
-LICENCES="GPL-3"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS="
-    debug
-    libnotify
-"
-
-DEPENDENCIES="
-    build:
-        sys-devel/gettext
-        virtual/pkg-config
-    build+run:
-        dev-libs/glib:2
-        sys-sound/alsa-lib
-        x11-libs/gtk+:3
-        x11-libs/libX11
-        libnotify? ( x11-libs/libnotify )
-"
-
-DEFAULT_SRC_CONFIGURE_PARAMS=(
-    '--enable-minimal-flags'
-    '--with-gtk3'
-)
-
-DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=(
-    'debug'
-)
-
-DEFAULT_SRC_CONFIGURE_OPTION_WITHS=(
-    'libnotify'
-)
-
-src_prepare() {
-    default
-    eautoreconf
-    edo glib-gettextize --force --copy
-}
-
-src_install() {
-    default
-    insinto /usr/share/icons/hicolor/128x128/apps
-    newins pixmaps/${PN}-about.png ${PN}.png
-}
-