From 24b01c6536bf7b7db96998fb31474b115136fb32 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Thu, 12 Apr 2007 19:54:19 +0000 Subject: [PATCH] Bugs 166167 and 174296 Package-Manager: portage-2.1.2.3 --- xfce-extra/xfce4-mixer/ChangeLog | 5 ++++- xfce-extra/xfce4-mixer/Manifest | 16 ++++++++-------- xfce-extra/xfce4-mixer/xfce4-mixer-4.4.1.ebuild | 9 ++++----- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/xfce-extra/xfce4-mixer/ChangeLog b/xfce-extra/xfce4-mixer/ChangeLog index 3292067538d8..2a570949e9e3 100644 --- a/xfce-extra/xfce4-mixer/ChangeLog +++ b/xfce-extra/xfce4-mixer/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for xfce-extra/xfce4-mixer # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/ChangeLog,v 1.86 2007/04/12 14:45:46 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/ChangeLog,v 1.87 2007/04/12 19:54:19 drac Exp $ + + 12 Apr 2007; Samuli Suominen xfce4-mixer-4.4.1.ebuild: + Bugs 166167 and 174296. Parallel make is dead. *xfce4-mixer-4.4.1 (11 Apr 2007) diff --git a/xfce-extra/xfce4-mixer/Manifest b/xfce-extra/xfce4-mixer/Manifest index 01a53dc97469..daa28a09ae09 100644 --- a/xfce-extra/xfce4-mixer/Manifest +++ b/xfce-extra/xfce4-mixer/Manifest @@ -9,14 +9,14 @@ EBUILD xfce4-mixer-4.4.0-r1.ebuild 1170 RMD160 30753d0f858646d655168fab6cc3c8e25 MD5 506d8bdfacc1619fc13db48f1c5bf60c xfce4-mixer-4.4.0-r1.ebuild 1170 RMD160 30753d0f858646d655168fab6cc3c8e257ec9871 xfce4-mixer-4.4.0-r1.ebuild 1170 SHA256 d3b913a9411556f5e98482bb1cb147542473381bc3f8e5470967579bc7c909ec xfce4-mixer-4.4.0-r1.ebuild 1170 -EBUILD xfce4-mixer-4.4.1.ebuild 1194 RMD160 8e709af7dcb6ad0cc30962b55ec1f937486ed8e7 SHA1 aec80905e3ecdf1f47d015a029549ef463a0739c SHA256 a79f8451260809628d285d2f265d45277c6ed814d14d8b40ca7d81d1ded1ec8b -MD5 44e48889a05955f69068f2e59610682d xfce4-mixer-4.4.1.ebuild 1194 -RMD160 8e709af7dcb6ad0cc30962b55ec1f937486ed8e7 xfce4-mixer-4.4.1.ebuild 1194 -SHA256 a79f8451260809628d285d2f265d45277c6ed814d14d8b40ca7d81d1ded1ec8b xfce4-mixer-4.4.1.ebuild 1194 -MISC ChangeLog 10584 RMD160 4959ce796a4f5c6272630083236324808dbd4f3e SHA1 841c65a85cf4350983d99286e1b98d3e2ed113a3 SHA256 2b142261da4a7e269be3b30d911485022761df41d1e78cb86d6fec7f07583edd -MD5 baa31d578ba889357eac229033744723 ChangeLog 10584 -RMD160 4959ce796a4f5c6272630083236324808dbd4f3e ChangeLog 10584 -SHA256 2b142261da4a7e269be3b30d911485022761df41d1e78cb86d6fec7f07583edd ChangeLog 10584 +EBUILD xfce4-mixer-4.4.1.ebuild 1070 RMD160 cbeaf2970d0d510cc8e094d88831a3601765bfb0 SHA1 694fbfc50c9d6d15073debe64ee2095f25c1561d SHA256 561af8b235d87e4f2a8efc392afc2f3a32e99b238ca4c41aa40cae0220c133f7 +MD5 8ec31459a85399a9253116b410980dd3 xfce4-mixer-4.4.1.ebuild 1070 +RMD160 cbeaf2970d0d510cc8e094d88831a3601765bfb0 xfce4-mixer-4.4.1.ebuild 1070 +SHA256 561af8b235d87e4f2a8efc392afc2f3a32e99b238ca4c41aa40cae0220c133f7 xfce4-mixer-4.4.1.ebuild 1070 +MISC ChangeLog 10707 RMD160 48e119a65e5aa272a869e0003c629400dfe3f757 SHA1 3b6a768f30df8c2c8d8e6d454a76c3cfd687acd1 SHA256 5aa7512749854ed7e6c1736028f712b6df7c55b3e25568ace79ea198cd04172a +MD5 6e50ecbd54f97f841aa3e8925e744687 ChangeLog 10707 +RMD160 48e119a65e5aa272a869e0003c629400dfe3f757 ChangeLog 10707 +SHA256 5aa7512749854ed7e6c1736028f712b6df7c55b3e25568ace79ea198cd04172a ChangeLog 10707 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157 diff --git a/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.1.ebuild b/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.1.ebuild index 02a466794a5a..b4115ef2f4ed 100644 --- a/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.1.ebuild +++ b/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.1.ebuild @@ -1,12 +1,15 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.1.ebuild,v 1.1 2007/04/12 14:45:46 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-mixer/xfce4-mixer-4.4.1.ebuild,v 1.2 2007/04/12 19:54:19 drac Exp $ inherit eutils xfce44 XFCE_VERSION=4.4.1 xfce44 +# Bugs 166167 and 174296. Parallel make is dead in xfce4-mixer. +xfce44_single_make + DESCRIPTION="Volume control application (ALSA or OSS)" HOMEPAGE="http://www.xfce.org/projects/xfce4-mixer" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" @@ -30,10 +33,6 @@ fi DOCS="AUTHORS ChangeLog NEWS NOTES README TODO" src_install() { - # .desktop file has allready been created by upstrean - # and make install tries to create it again. Bug 166167 - # update: seems to be parallel make issue. needs a fix. - rm panel-plugin/xfce4-mixer.desktop xfce44_src_install make_desktop_entry ${PN} "Volume control" ${PN} AudioVideo } -- 2.26.2