summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Ahlberg <aliz@gentoo.org>2004-03-10 13:26:20 +0000
committerDaniel Ahlberg <aliz@gentoo.org>2004-03-10 13:26:20 +0000
commitf087882108feac4047434ef0c85439c9290abd5b (patch)
treec98d88b45dfe1fe13440bd50c4d4032753e99087
parentVersion bump. (diff)
downloadhistorical-f087882108feac4047434ef0c85439c9290abd5b.tar.gz
historical-f087882108feac4047434ef0c85439c9290abd5b.tar.bz2
historical-f087882108feac4047434ef0c85439c9290abd5b.zip
Fix for #41399.
-rw-r--r--media-plugins/xmms-kde/ChangeLog7
-rw-r--r--media-plugins/xmms-kde/Manifest5
-rw-r--r--media-plugins/xmms-kde/files/xmms-kde-3.1_beta1-libsuffix-fix.patch12
-rw-r--r--media-plugins/xmms-kde/xmms-kde-3.1_beta1.ebuild12
4 files changed, 29 insertions, 7 deletions
diff --git a/media-plugins/xmms-kde/ChangeLog b/media-plugins/xmms-kde/ChangeLog
index 90306195c00b..af798a53cda2 100644
--- a/media-plugins/xmms-kde/ChangeLog
+++ b/media-plugins/xmms-kde/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-plugins/xmms-kde
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-kde/ChangeLog,v 1.1 2004/01/25 09:33:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-kde/ChangeLog,v 1.2 2004/03/10 13:26:20 aliz Exp $
+
+ 10 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> xmms-kde-3.1_beta1.ebuild:
+ Added patch for proper libsuffix handling, needed on amd64. Should close #41399.
+
+*xmms-kde-3.1_beta1 (25 Jan 2004)
25 Jan 2004; Jeremy Huddleston <eradicator@gentoo.org> :
xmms-kde is a kde panel applet which allows you to control xmms or noatun. The
diff --git a/media-plugins/xmms-kde/Manifest b/media-plugins/xmms-kde/Manifest
index 8bf82510b2d7..ee85d8d9d25a 100644
--- a/media-plugins/xmms-kde/Manifest
+++ b/media-plugins/xmms-kde/Manifest
@@ -1,4 +1,5 @@
-MD5 38dadf4b75e5a4ff72ab642c60bda127 ChangeLog 441
-MD5 f3b1fd22f67b70389a3d292f277bbeb5 xmms-kde-3.1_beta1.ebuild 1000
+MD5 3f8c84f04c02cf2b2323c9d7c89f597f xmms-kde-3.1_beta1.ebuild 1098
+MD5 f8678978dbdb30b1f1e0fd12f56cc2c9 ChangeLog 629
MD5 12f9a79eb9cb758efadb993fd2288a91 metadata.xml 696
+MD5 8ba6b5722200f81d0d033db7deea9cff files/xmms-kde-3.1_beta1-libsuffix-fix.patch 393
MD5 c0d893c15bd9e1b8ac53e6bf6decffe7 files/digest-xmms-kde-3.1_beta1 70
diff --git a/media-plugins/xmms-kde/files/xmms-kde-3.1_beta1-libsuffix-fix.patch b/media-plugins/xmms-kde/files/xmms-kde-3.1_beta1-libsuffix-fix.patch
new file mode 100644
index 000000000000..11f018cc38ce
--- /dev/null
+++ b/media-plugins/xmms-kde/files/xmms-kde-3.1_beta1-libsuffix-fix.patch
@@ -0,0 +1,12 @@
+--- acinclude.m4 2004-03-10 14:21:11.368742596 +0100
++++ acinclude.m4 2004-03-10 14:21:13.791734633 +0100
+@@ -2866,6 +2866,9 @@
+ kdelibsuff=
+ fi
+ fi
++ if test "$kdelibsuff" = "no"; then
++ kdelibsuff=
++ fi
+ if test -z "$kdelibsuff"; then
+ AC_MSG_RESULT([not using lib directory suffix])
+ AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
diff --git a/media-plugins/xmms-kde/xmms-kde-3.1_beta1.ebuild b/media-plugins/xmms-kde/xmms-kde-3.1_beta1.ebuild
index f06dca00ddc2..ac625615bdf1 100644
--- a/media-plugins/xmms-kde/xmms-kde-3.1_beta1.ebuild
+++ b/media-plugins/xmms-kde/xmms-kde-3.1_beta1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-kde/xmms-kde-3.1_beta1.ebuild,v 1.1 2004/01/25 09:33:47 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-kde/xmms-kde-3.1_beta1.ebuild,v 1.2 2004/03/10 13:26:20 aliz Exp $
inherit kde-base
@@ -15,7 +15,8 @@ SRC_URI="http://osdn.dl.sourceforge.net/sourceforge/xmms-kde/${MY_P}.tar.gz"
LICENSE="GPL-2"
DEPEND="xmms? >=media-sound/xmms-1.2.7-r23
- sdl? >=media-libs/smpeg-0.4.4-r4"
+ sdl? >=media-libs/smpeg-0.4.4-r4
+ sys-devel/autoconf"
#RDEPEND=""
need-kde 3.1
@@ -25,10 +26,13 @@ need-kde 3.1
src_unpack() {
kde_src_unpack
+ epatch ${FILESDIR}/${P}-libsuffix-fix.patch
+ aclocal
+ autoconf
}
src_compile() {
- myconf="--enable-final --disable-gtk-test `use_enable xinerama`"
+ myconf="--enable-final --disable-libsuffix --disable-gtk-test `use_enable xinerama`"
kde_src_compile
}