Bump x11-plugins/wmix-3.1 revision, with fixes for program version and manpage. Remove old ebuilds. Closes #56270

6 files changed, 109 insertions, 10 deletions

diff --git a/x11-plugins/wmix/ChangeLog b/x11-plugins/wmix/ChangeLog
index e478370e9511..22b47f62e2c8 100644
--- a/x11-plugins/wmix/ChangeLog
+++ b/x11-plugins/wmix/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-plugins/wmix
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmix/ChangeLog,v 1.10 2004/07/17 20:51:39 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmix/ChangeLog,v 1.11 2004/07/19 09:22:11 s4t4n Exp $
+
+*wmix-3.1-1 (19 Jul 2004)
+
+  19 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmix-3.1-r1.ebuild:
+  New ebuild with patch to correct version number, plus new fixed and
+  updated man page. Fixes #56270, reported by Jan Rychter.
+  wmix-3.1.ebuild:
+  Remove old ebuild.
 
   17 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> wmix-3.0-1.ebuild:
   Removing old ebuild, it doesn't work on 2.6 kernels...
diff --git a/x11-plugins/wmix/Manifest b/x11-plugins/wmix/Manifest
index 0be4105ce50e..c0953ac4afe1 100644
--- a/x11-plugins/wmix/Manifest
+++ b/x11-plugins/wmix/Manifest
@@ -1,4 +1,6 @@
-MD5 4d5b70d6d037ac85414b30c3495b0118 wmix-3.1.ebuild 746
-MD5 30b91e390744e13b5359c31614295711 ChangeLog 1339
+MD5 94fa907d18c9feb8349824addaab75b7 wmix-3.1-r1.ebuild 932
+MD5 f12d71d5b41e66d03a2484c60566ac04 ChangeLog 1609
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
-MD5 ad16349941063942ee420bd1937e8ad0 files/digest-wmix-3.1 59
+MD5 781977617f85fb58342bc62e24baa6f2 files/fix-wmix-3.1-version-number.patch 277
+MD5 e8c2db20d30dd92cc219e4364aaf7830 files/wmix.1 1969
+MD5 ad16349941063942ee420bd1937e8ad0 files/digest-wmix-3.1-r1 59
diff --git a/x11-plugins/wmix/files/digest-wmix-3.1 b/x11-plugins/wmix/files/digest-wmix-3.1-r1
index 171487793135..171487793135 100644
--- a/x11-plugins/wmix/files/digest-wmix-3.1
+++ b/x11-plugins/wmix/files/digest-wmix-3.1-r1
diff --git a/x11-plugins/wmix/files/fix-wmix-3.1-version-number.patch b/x11-plugins/wmix/files/fix-wmix-3.1-version-number.patch
new file mode 100644
index 000000000000..65b7ac9688e0
--- /dev/null
+++ b/x11-plugins/wmix/files/fix-wmix-3.1-version-number.patch
@@ -0,0 +1,11 @@
+--- wmix.c	2004-07-19 10:37:58.999866344 +0200
++++ wmix.c	2004-07-19 10:38:11.541959656 +0200
+@@ -38,7 +38,7 @@
+ #include "include/misc.h"
+ #include "include/ui_x.h"
+ 
+-#define VERSION "3.0"
++#define VERSION "3.1"
+ 
+ static Display *display;
+ static char *display_name = NULL;
diff --git a/x11-plugins/wmix/files/wmix.1 b/x11-plugins/wmix/files/wmix.1
new file mode 100644
index 000000000000..afd65224bbe5
--- /dev/null
+++ b/x11-plugins/wmix/files/wmix.1
@@ -0,0 +1,68 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\"
+.\" This documentation may be distributed under the terms of
+.\" the GNU General Public Licence version 2.
+.\"
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH wmix 1 "Jul 19, 2004" "Michele Noberasco"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+wmix \- Dockapp mixer for OSS or ALSA
+
+
+.SH SYNOPSIS
+.B wmix
+.RI "{ " options " }"
+
+
+.SH DESCRIPTION
+.B wmix
+Dockapp mixer for OSS or ALSA. Allows toggling record source,
+muting individual channels, adjusting volume and balance, all in a
+compact dockapp size, with TV\-like on\-screen\-display for volume levels.
+.LP 
+Supports mousewheel to adjust current channelvolume
+and can be controlled remotely with SIGUSR1 / SIGUSR2 to adjust the volume.
+Keeps a simple configuration file for user\-defined settings.
+
+
+.SH OPTIONS
+.TP 
+.BI "\-d " dsp
+Connect to remote X display.
+.TP 
+.BI "\-f " file
+Use alternate config file (default is \fI~/.wmixrc\fP)
+.TP 
+.BI "\-m " dev
+Use this mixer device (default  is \fI/dev/mixer\fP)
+.TP 
+.BI "\-h"
+Display list of command line options.
+.TP 
+.BI "\-v"
+Use verbose output messages.
+.TP 
+.BI "\-e " name
+Exclude a channel, can be used many times.
+
+
+.SH AUTHORS
+wmix was written by <timecop@japan.co.jp> and <skunk@mit.edu>
+.LP 
+This man page was written by Fredrik Steen <stone@debian.org> for the Debian
+distribution. Updated and fixed by Michele Noberasco <s4t4n@gentoo.org>
+for the Gentoo distribution.
diff --git a/x11-plugins/wmix/wmix-3.1.ebuild b/x11-plugins/wmix/wmix-3.1-r1.ebuild
index 35741e382501..d7134301e813 100644
--- a/x11-plugins/wmix/wmix-3.1.ebuild
+++ b/x11-plugins/wmix/wmix-3.1-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmix/wmix-3.1.ebuild,v 1.2 2004/07/06 16:27:55 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmix/wmix-3.1-r1.ebuild,v 1.1 2004/07/19 09:22:11 s4t4n Exp $
+
+inherit eutils
 
 IUSE=""
 DESCRIPTION="Dockapp mixer for OSS or ALSA"
@@ -14,19 +16,27 @@ KEYWORDS="x86 ~sparc ~amd64 ~ppc"
 DEPEND="virtual/x11
 	>=sys-apps/sed-4"
 
-src_unpack() {
+src_unpack()
+{
 	unpack ${A} ; cd ${S}
 	sed -i -e "/^CFLAGS/d" Makefile
+
+	# duh, wmix author forgot to update the version number
+	epatch ${FILESDIR}/fix-wmix-3.1-version-number.patch
 }
 
-src_compile() {
+src_compile()
+{
 	emake || die
 }
 
-src_install () {
+src_install ()
+{
 	exeinto /usr/bin
 	doexe wmix
-	gzip -cd wmix.1x.gz > wmix.1
-	doman wmix.1
+
+	# Original manpage does not work, we provide a fixed (and updated) one
+	doman ${FILESDIR}/wmix.1
+
 	dodoc README COPYING INSTALL NEWS BUGS AUTHORS sample.wmixrc
 }