summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny van Dyk <kugelfang@gentoo.org>2004-08-29 10:17:36 +0000
committerDanny van Dyk <kugelfang@gentoo.org>2004-08-29 10:17:36 +0000
commit2cf6a3b84f87547244a5d2c0124c21c22e87d2b5 (patch)
tree8266f05f3f0251007d4da976a0bcd39b836b2f92 /dev-util
parentMoving to x11-base/x11-drm (diff)
downloadhistorical-2cf6a3b84f87547244a5d2c0124c21c22e87d2b5.tar.gz
historical-2cf6a3b84f87547244a5d2c0124c21c22e87d2b5.tar.bz2
historical-2cf6a3b84f87547244a5d2c0124c21c22e87d2b5.zip
Fixed BUG #60062. ~amd64
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/kdevelop/ChangeLog6
-rw-r--r--dev-util/kdevelop/Manifest5
-rw-r--r--dev-util/kdevelop/files/kdevelop-3.1.0-bdb-mutex.patch11
-rw-r--r--dev-util/kdevelop/kdevelop-3.1.0.ebuild5
4 files changed, 22 insertions, 5 deletions
diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index bd0b2dd8da89..f3a8aef41ca1 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/kdevelop
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.64 2004/08/22 20:30:35 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.65 2004/08/29 10:17:36 kugelfang Exp $
+
+ 29 Aug 2004; Danny van Dyk <kugelfang@gentoo.org>
+ +files/kdevelop-3.1.0-bdb-mutex.patch, kdevelop-3.1.0.ebuild:
+ Fixed BUG #60062. Marked ~amd64 again.
22 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> kdevelop-3.1.0.ebuild,
kdevelop-3.1.0_rc2.ebuild:
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 5129900ef71e..ecf1fdea9316 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,10 +1,11 @@
-MD5 42890d929806a4b0b072dd37b679b89d ChangeLog 10817
-MD5 8725386ed75aa2af63541aca7e5e6058 kdevelop-3.1.0.ebuild 2682
+MD5 0ac8fcbedd93e9c8ef5f81abe8991aff ChangeLog 10975
+MD5 ada3e81dcf4afe9b1997301a2c1fa3a9 kdevelop-3.1.0.ebuild 2724
MD5 bf856f8055e120410328b9a4fc4650f6 kdevelop-3.0.4.ebuild 2567
MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
MD5 ba7ec079bb82433cb2f97d76dd79f568 kdevelop-3.1.0_rc2.ebuild 2700
MD5 e54dcf4fdb97d582d25c7ef6dc335d1c files/digest-kdevelop-3.1.0 68
MD5 6a803afe94792dfe48514e5559f2c1cb files/digest-kdevelop-3.0.4 68
+MD5 9447051d4dcf850c07cf09599f8181f3 files/kdevelop-3.1.0-bdb-mutex.patch 509
MD5 5dbe87ca31912cf4eeba60fb16082225 files/htdig.conf 8248
MD5 dcdcaf1dea68db854de8dad4df83c096 files/kdevelop-3.1_beta1-bdb-fPIC.patch 391
MD5 917039709890a164eca147f1e407fd2c files/digest-kdevelop-3.1.0_rc2 72
diff --git a/dev-util/kdevelop/files/kdevelop-3.1.0-bdb-mutex.patch b/dev-util/kdevelop/files/kdevelop-3.1.0-bdb-mutex.patch
new file mode 100644
index 000000000000..08d0d25a1fba
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-3.1.0-bdb-mutex.patch
@@ -0,0 +1,11 @@
+--- kdevelop-3.1.0/bdb/include/mutex.h.old 2004-08-29 04:59:55.583591176 +0200
++++ kdevelop-3.1.0/bdb/include/mutex.h 2004-08-29 05:00:01.196737848 +0200
+@@ -621,7 +621,7 @@
+ #define MUTEX_SET(tsl) ({ \
+ register tsl_t *__l = (tsl); \
+ int __r; \
+- asm volatile("mov $1,%%rax; lock; xchgb %1,%%al; xor $1,%%rax"\
++ __asm volatile("mov $1,%%rax; lock; xchgb %1,%%al; xor $1,%%rax"\
+ : "=&a" (__r), "=m" (*__l) \
+ : "1" (*__l) \
+ ); \
diff --git a/dev-util/kdevelop/kdevelop-3.1.0.ebuild b/dev-util/kdevelop/kdevelop-3.1.0.ebuild
index e7c8acc5ac9a..dc53b75086e9 100644
--- a/dev-util/kdevelop/kdevelop-3.1.0.ebuild
+++ b/dev-util/kdevelop/kdevelop-3.1.0.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/dev-util/kdevelop/kdevelop-3.1.0.ebuild,v 1.2 2004/08/22 20:30:35 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.1.0.ebuild,v 1.3 2004/08/29 10:17:36 kugelfang Exp $
inherit python kde eutils
@@ -12,7 +12,7 @@ DESCRIPTION="KDevelop is an easy to use C/C++ IDE for Unix. It supports KDE/Qt,
SRC_URI="mirror://kde/stable/3.3/src/${MY_P}.tar.bz2"
HOMEPAGE="http://www.kdevelop.org"
LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc -amd64"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
SLOT=3
DEPEND="dev-lang/perl
@@ -31,6 +31,7 @@ src_unpack() {
if use amd64; then
epatch ${FILESDIR}/${P/.0/_beta1}-bdb-fPIC.patch
+ epatch ${FILESDIR}/${P}-bdb-mutex.patch
fi
}