Only installing .desktop file to applications dir. Fixed building with -nls to close bug #58897.

4 files changed, 50 insertions, 10 deletions

diff --git a/media-sound/aumix/ChangeLog b/media-sound/aumix/ChangeLog
index 9563fc20a647..e0d6c26276fd 100644
--- a/media-sound/aumix/ChangeLog
+++ b/media-sound/aumix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/aumix
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/ChangeLog,v 1.38 2004/10/15 11:59:02 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/ChangeLog,v 1.39 2004/10/31 10:15:29 eradicator Exp $
+
+  31 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/aumix-2.8-nls.patch:
+  Only installing .desktop file to applications dir. Fixed building with -nls
+  to close bug #58897.
 
   15 Oct 2004; David Holm <dholm@gentoo.org> aumix-2.8-r2.ebuild:
   Added to ~ppc.
diff --git a/media-sound/aumix/Manifest b/media-sound/aumix/Manifest
index 7a2729d25016..110dcad3c8b1 100644
--- a/media-sound/aumix/Manifest
+++ b/media-sound/aumix/Manifest
@@ -1,15 +1,26 @@
-MD5 70958143806657d46043b3af17e9c337 ChangeLog 4655
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5890f8cb776bee5f59bd3774bf3014d9 ChangeLog 4849
 MD5 3ec2efd4f2b55d249cb17b10597bb454 aumix-2.7-r4.ebuild 1257
 MD5 1da36b17ad3de7a3dd66325a008acafd aumix-2.8-r1.ebuild 1534
 MD5 38cd9c05d169095321629e9583d8d7c2 aumix-2.8.ebuild 1384
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 4291d618e6437e459860f82c92c49a3a aumix-2.8-r2.ebuild 1743
+MD5 f6bdb468f7b065641f72ef7d22da32b8 aumix-2.8-r2.ebuild 1637
 MD5 f39abfbf49ff4a33e109eeb14a4325c2 files/aumix.desktop 124
 MD5 2a30dad042032aa7d5227f941b8d2d08 files/aumix.rc6 1137
 MD5 e4d29edb4b7c339ca310738a7e9dd174 files/digest-aumix-2.7-r4 61
 MD5 857a1fe260905ab09b7befd877affafd files/digest-aumix-2.8 62
 MD5 857a1fe260905ab09b7befd877affafd files/digest-aumix-2.8-r1 62
-MD5 00da88dc336799f1385f518dd005dd5a files/aumix-2.8-close-dialogs.patch 613
+MD5 857a1fe260905ab09b7befd877affafd files/digest-aumix-2.8-r2 62
 MD5 6c8d691beb495257d8309e58c127acd2 files/aumix-2.8-nohome.patch 529
+MD5 00da88dc336799f1385f518dd005dd5a files/aumix-2.8-close-dialogs.patch 613
 MD5 221509621be1606c1a61dfc8fcd4991e files/aumix-2.8-save_load.patch 1331
-MD5 857a1fe260905ab09b7befd877affafd files/digest-aumix-2.8-r2 62
+MD5 d9da97283ec0459e7981a3aea2557e42 files/aumix-2.8-nls.patch 829
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBhLuIArHZZzCEUG0RAqmhAJ4xngA/GhiXWrx6oEfpebNZH+Oo+wCfZ76D
+qthrC7RlgA8IYxEyJn4uCfY=
+=YKHG
+-----END PGP SIGNATURE-----
diff --git a/media-sound/aumix/aumix-2.8-r2.ebuild b/media-sound/aumix/aumix-2.8-r2.ebuild
index 3dcd58cc35d5..1e9ccd31ab9d 100644
--- a/media-sound/aumix/aumix-2.8-r2.ebuild
+++ b/media-sound/aumix/aumix-2.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/aumix-2.8-r2.ebuild,v 1.6 2004/10/15 11:59:02 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aumix/aumix-2.8-r2.ebuild,v 1.7 2004/10/31 10:15:29 eradicator Exp $
 
 IUSE="gtk gtk2 gpm nls"
 
@@ -29,6 +29,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-nohome.patch
 	epatch ${FILESDIR}/${P}-close-dialogs.patch
 	epatch ${FILESDIR}/${P}-save_load.patch
+	epatch ${FILESDIR}/${P}-nls.patch
 }
 
 src_compile() {
@@ -60,10 +61,6 @@ src_install() {
 
 	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
 
-	insinto /usr/share/gnome/apps/Multimedia
-	doins ${FILESDIR}/aumix.desktop
-	insinto /usr/share/applnk/Multimedia
-	doins ${FILESDIR}/aumix.desktop
 	insinto /usr/share/applications
 	doins ${FILESDIR}/aumix.desktop
 
diff --git a/media-sound/aumix/files/aumix-2.8-nls.patch b/media-sound/aumix/files/aumix-2.8-nls.patch
new file mode 100644
index 000000000000..3243d48409f3
--- /dev/null
+++ b/media-sound/aumix/files/aumix-2.8-nls.patch
@@ -0,0 +1,27 @@
+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	2004-10-31 02:11:40.038574588 -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	2004-10-31 02:11:09.622964264 -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])