diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-08-21 04:09:30 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-08-21 04:09:30 +0000 |
commit | ddafa3cd35dd5f86bfaddc18627f2d1f68efb454 (patch) | |
tree | 24cce6b7c4e0926f9f2cd02c2583237feff81a12 /media-sound/aumix | |
parent | Respect LDFLAGS wrt #333727 by Diego E. Pettenò. (diff) | |
download | gentoo-2-ddafa3cd35dd5f86bfaddc18627f2d1f68efb454.tar.gz gentoo-2-ddafa3cd35dd5f86bfaddc18627f2d1f68efb454.tar.bz2 gentoo-2-ddafa3cd35dd5f86bfaddc18627f2d1f68efb454.zip |
old
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/aumix')
-rw-r--r-- | media-sound/aumix/Manifest | 7 | ||||
-rw-r--r-- | media-sound/aumix/aumix-2.8-r4.ebuild | 70 | ||||
-rw-r--r-- | media-sound/aumix/files/aumix-2.8-close-dialogs.patch | 18 | ||||
-rw-r--r-- | media-sound/aumix/files/aumix-2.8-mute.patch | 16 | ||||
-rw-r--r-- | media-sound/aumix/files/aumix-2.8-nls.patch | 27 | ||||
-rw-r--r-- | media-sound/aumix/files/aumix-2.8-nohome.patch | 12 | ||||
-rw-r--r-- | media-sound/aumix/files/aumix-2.8-save_load.patch | 45 |
7 files changed, 0 insertions, 195 deletions
diff --git a/media-sound/aumix/Manifest b/media-sound/aumix/Manifest index 0a41c8d2ff02..4280ce521444 100644 --- a/media-sound/aumix/Manifest +++ b/media-sound/aumix/Manifest @@ -1,12 +1,5 @@ -AUX aumix-2.8-close-dialogs.patch 613 RMD160 e06045a6aac2925d4578562d2133ea6a25a8c336 SHA1 e214e5e4be13bb744ef5a02e6b20ced41af82eef SHA256 d9dbe541d875b5918c8b86adcb5d217c2988cf26f6ff6680bbc6523be294dab3 -AUX aumix-2.8-mute.patch 470 RMD160 b1db29828cc06c02a94c0a8c88206f478b30d909 SHA1 34213e7973094b5b4fefa4f2f68a2913766cef04 SHA256 7b19f89a6b5ecb97181c1154c6ee21079ecc2ccfe25a5b3fb8fd670709a61a14 -AUX aumix-2.8-nls.patch 829 RMD160 bbc28e1285acdbadf0f3c58e18ab94f7160e6299 SHA1 dbe73b4599f5ef6834fd546ba795f83b92cb8453 SHA256 b0e2a27c422c6c106863521a7bd43741e74cfa86e490096da8209138c0a03b45 -AUX aumix-2.8-nohome.patch 529 RMD160 93ac976f5dd420ac63806e14fd3abc44d726f244 SHA1 449aaf90721769a806de94378cb943ffc3c5fa19 SHA256 fc0f6ee2a545f7340dc5a78fce6553132d274c607ec4473019f3c8ff62e598c7 -AUX aumix-2.8-save_load.patch 1331 RMD160 5568874206654f06bce4a29a3039deee5760b45d SHA1 83b85df37e12f676143543c1b5c95c72455043dd SHA256 01adab9a3da9b1955b805bb2a47cc1cff8865625f6a726331f9911055d578e07 AUX aumix.rc6 1143 RMD160 0db7127132b291eabbc7ebe178c6d862ccf8503c SHA1 62bce541e0f6c94f6be9f54db46675ec58d55f9b SHA256 571dc62080770e98c74390a5e7f6baa1187f6e8553b3528d623d5d577ed0eb27 -DIST aumix-2.8.tar.bz2 157503 RMD160 f7ab3737af772b97359dfc5d9852d06fda05aaa5 SHA1 5cea563ae91f628433a1950a36efd23681da4bf4 SHA256 636eef7f400c2f3df489c0d2fa21507e88692113561e75a40a26c52bc422d7fc DIST aumix-2.9.1.tar.bz2 231622 RMD160 a68d2e1da251edad721e997099d8149075f07449 SHA1 1b84054cfb74d3513b254d05c2fb08f6a6a3edc7 SHA256 d2ce43d532ef75072c8d4e7922e3bc06be6d97765a508d9ceb0d1766bbe70e29 -EBUILD aumix-2.8-r4.ebuild 1699 RMD160 2ce8d9e868b21810020eeda14a4b708a2ff01e1c SHA1 a693d2c534757b7ffa5679354b6243b9eb8199f8 SHA256 dfb0bf2622fa72fda8ff3588cbfd4aef33b9e8f1b2abc5556011d647bc5283c5 EBUILD aumix-2.9.1.ebuild 1104 RMD160 f2403dbe872bb98e009244dcd678bad7a64e54cb SHA1 47c80c71a27d81185d47b0b940b2e957bf6e1961 SHA256 874a21e26ff49f108400395e3af17457f8abc6683030589e758b84d3aadd061e MISC ChangeLog 8973 RMD160 f4eb576dd6470eb817967e18c1041b5ecd53e7c9 SHA1 9eaffe26001a514f6829ff654052526b21b963e6 SHA256 df2ec51c6c494cf1ac053df084c3feae3dbc6bf75653919704259c60e24e85fc MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b diff --git a/media-sound/aumix/aumix-2.8-r4.ebuild b/media-sound/aumix/aumix-2.8-r4.ebuild deleted file mode 100644 index 66d970921fab..000000000000 --- a/media-sound/aumix/aumix-2.8-r4.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/aumix-2.8-r4.ebuild,v 1.13 2008/03/31 04:10:09 ricmm Exp $ - -inherit eutils - -DESCRIPTION="Aumix volume/mixer control program" -HOMEPAGE="http://jpj.net/~trevor/aumix.html" -SRC_URI="http://jpj.net/~trevor/aumix/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86" -IUSE="gpm gtk nls" - -#alsa support is broken in 2.8 alsa? ( >=media-libs/alsa-lib-0.9.0_rc1 ) -RDEPEND=">=sys-libs/ncurses-5.2 - gpm? ( >=sys-libs/gpm-1.19.3 ) - gtk? ( >=x11-libs/gtk+-2.0.0 ) - nls? ( virtual/libintl )" - -DEPEND="${RDEPEND} - sys-apps/findutils - nls? ( sys-devel/gettext )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-nohome.patch - epatch "${FILESDIR}"/${P}-close-dialogs.patch - epatch "${FILESDIR}"/${P}-save_load.patch - epatch "${FILESDIR}"/${P}-nls.patch - epatch "${FILESDIR}/${P}-mute.patch" - - # Prevent auto* from rerunning... bug #70379 - touch aclocal.m4 configure - find . -name Makefile.in -o -name stamp-h.in -print0 | xargs -0 touch; - touch configure -} - -src_compile() { - local myconf="--without-gtk1" - - # use_with borks becasue of bad configure script. - if ! use gtk; then - myconf="${myconf} --without-gtk" - fi - - if ! use gpm; then - myconf="${myconf} --without-gpm" - fi - - econf \ - `use_enable nls` \ - ${myconf} || die - emake || die "make failed" -} - -src_install() { - make DESTDIR="${D}" install || die - - dodoc AUTHORS BUGS ChangeLog NEWS README TODO - - newinitd "${FILESDIR}"/aumix.rc6 aumix - - if use gtk; then - doicon data/aumix.xpm - make_desktop_entry aumix Aumix aumix - fi -} diff --git a/media-sound/aumix/files/aumix-2.8-close-dialogs.patch b/media-sound/aumix/files/aumix-2.8-close-dialogs.patch deleted file mode 100644 index e2d46cc86cf4..000000000000 --- a/media-sound/aumix/files/aumix-2.8-close-dialogs.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- ./src/gtk.c.tv 2003-09-04 19:18:07.000000000 +0200 -+++ ./src/gtk.c 2003-09-04 19:18:41.000000000 +0200 -@@ -425,6 +425,7 @@ - /* Get the selected filename and copy it into the global save_filename. */ - { - save_filename = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(fs))); -+ gtk_widget_destroy(fs); - ErrorExitWarn(LoadSettings(), 'w'); - } - -@@ -432,6 +433,7 @@ - /* Get the selected filename and copy it into the global save_filename. */ - { - save_filename = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(fs))); -+ gtk_widget_destroy(fs); - ErrorExitWarn(SaveSettings(), 'e'); - } - diff --git a/media-sound/aumix/files/aumix-2.8-mute.patch b/media-sound/aumix/files/aumix-2.8-mute.patch deleted file mode 100644 index 8a32fd5b9b87..000000000000 --- a/media-sound/aumix/files/aumix-2.8-mute.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix mute script: save volume and then set it to 0 instead of saving it directly -to 0. Bug #122087. -Index: aumix-2.8/src/mute -=================================================================== ---- aumix-2.8.orig/src/mute -+++ aumix-2.8/src/mute -@@ -8,7 +8,8 @@ - volumes=$(aumix -vq |tr -d ,) - if [ $(echo $volumes | awk '{print $2}') -ne 0 -o \ - $(echo $volumes | awk '{print $3}') -ne 0 ]; then -- aumix -S -v 0 -+ aumix -S -+ aumix -v 0 - else - aumix -L > /dev/null - fi diff --git a/media-sound/aumix/files/aumix-2.8-nls.patch b/media-sound/aumix/files/aumix-2.8-nls.patch deleted file mode 100644 index 7c79d9ebd6b3..000000000000 --- a/media-sound/aumix/files/aumix-2.8-nls.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur aumix-2.8.orig/configure aumix-2.8/configure ---- aumix-2.8.orig/configure 2002-11-24 17:35:48.000000000 -0800 -+++ aumix-2.8/configure 2002-11-24 17:35:48.000000000 -0800 -@@ -3801,10 +3801,6 @@ - USE_INCLUDED_LIBINTL=no - - --USE_NLS=yes -- -- -- - trap '' 1 2 15 - cat > confcache <<\EOF - # This file is a shell script that caches the results of configure -diff -Naur aumix-2.8.orig/configure.in aumix-2.8/configure.in ---- aumix-2.8.orig/configure.in 2002-11-24 17:04:16.000000000 -0800 -+++ aumix-2.8/configure.in 2002-11-24 17:04:16.000000000 -0800 -@@ -240,9 +240,6 @@ - USE_INCLUDED_LIBINTL=no - AC_SUBST(USE_INCLUDED_LIBINTL) - --USE_NLS=yes --AC_SUBST(USE_NLS) -- - dnl AC_OUTPUT(Makefile) - dnl AC_OUTPUT([Makefile intl/Makefile.in po/Makefile.in], - dnl [AUMIX_PROCESS_PO test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h]) diff --git a/media-sound/aumix/files/aumix-2.8-nohome.patch b/media-sound/aumix/files/aumix-2.8-nohome.patch deleted file mode 100644 index bf20f0372c00..000000000000 --- a/media-sound/aumix/files/aumix-2.8-nohome.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur aumix-2.8.orig/src/common.c aumix-2.8/src/common.c ---- aumix-2.8.orig/src/common.c 2002-10-29 13:27:51.000000000 -0800 -+++ aumix-2.8/src/common.c 2004-07-22 01:28:07.684999900 -0700 -@@ -591,7 +591,7 @@ - char filename[PATH_MAX]; - if (save_filename == NULL) { - home = getenv("HOME"); -- if ((strlen(home) + strlen(AUMIXRC) + 2) < PATH_MAX) { -+ if (home && (strlen(home) + strlen(AUMIXRC) + 2) < PATH_MAX) { - sprintf(filename, "%s/.%s", home, AUMIXRC); - setfile = CheckAndOpen(filename, mode); - } diff --git a/media-sound/aumix/files/aumix-2.8-save_load.patch b/media-sound/aumix/files/aumix-2.8-save_load.patch deleted file mode 100644 index cf3c409eb015..000000000000 --- a/media-sound/aumix/files/aumix-2.8-save_load.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- ./src/common.c.load 2002-11-28 14:22:00.000000000 +0100 -+++ ./src/common.c 2002-11-28 14:23:11.000000000 +0100 -@@ -116,6 +116,7 @@ - int main(int argc, char *argv[]) - { - int optn, ii; -+ int save = 0, load = 0; - #ifdef HAVE_CURSES - int setcolors = FALSE; - #endif /* HAVE_CURSES */ -@@ -171,14 +172,10 @@ - break; - #endif /* HAVE_CURSES */ - case 'S': /* Save to file. */ -- if (mixer_fd == -1) -- ErrorExitWarn(InitializeMixer(device_filename), 'e'); -- ErrorExitWarn(SaveSettings(), 'e'); -+ save = 1; - break; - case 'L': /* Load from file. */ -- if (mixer_fd == -1) -- ErrorExitWarn(InitializeMixer(device_filename), 'e'); -- ErrorExitWarn(LoadSettings(), 'e'); -+ load = 1; - break; - #if defined (HAVE_CURSES) || defined (HAVE_GTK) || defined (HAVE_GTK1) - case 'I': /* User asked for interactive mode. */ -@@ -194,6 +191,17 @@ - } - } - } -+ if (save | load) { -+ if (mixer_fd == -1) -+ ErrorExitWarn(InitializeMixer(device_filename), 'e'); -+ if (save) -+ ErrorExitWarn(SaveSettings(), 'e'); -+ else -+ ErrorExitWarn(LoadSettings(), 'e'); -+ close(mixer_fd); -+ exit(EXIT_SUCCESS); -+ } -+ - #if defined (HAVE_CURSES) || defined (HAVE_GTK) || defined (HAVE_GTK1) - /* Be interactive if no options were given. */ - if (!interactive && argc <= 1) |