* [gentoo-commits] gentoo-x86 commit in dev-util/subversion: ChangeLog subversion-1.6.0.ebuild
@ 2009-03-22 14:40 Arfrever Frehtes Taifersar Arahesis (arfrever)
0 siblings, 0 replies; 4+ messages in thread
From: Arfrever Frehtes Taifersar Arahesis (arfrever) @ 2009-03-22 14:40 UTC (permalink / raw
To: gentoo-commits
arfrever 09/03/22 14:40:03
Modified: ChangeLog subversion-1.6.0.ebuild
Log:
Fix detection of Berkeley DB (bug #263347).
(Portage version: 13142-svn/cvs/Linux x86_64)
Revision Changes Path
1.353 dev-util/subversion/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?rev=1.353&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?rev=1.353&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?r1=1.352&r2=1.353
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -r1.352 -r1.353
--- ChangeLog 22 Mar 2009 02:07:57 -0000 1.352
+++ ChangeLog 22 Mar 2009 14:40:03 -0000 1.353
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/subversion
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.352 2009/03/22 02:07:57 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.353 2009/03/22 14:40:03 arfrever Exp $
+
+ 22 Mar 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ subversion-1.6.0.ebuild:
+ Fix detection of Berkeley DB (bug #263347).
*subversion-1.6.0 (22 Mar 2009)
1.2 dev-util/subversion/subversion-1.6.0.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild?r1=1.1&r2=1.2
Index: subversion-1.6.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- subversion-1.6.0.ebuild 22 Mar 2009 02:07:57 -0000 1.1
+++ subversion-1.6.0.ebuild 22 Mar 2009 14:40:03 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v 1.1 2009/03/22 02:07:57 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v 1.2 2009/03/22 14:40:03 arfrever Exp $
EAPI="1"
@@ -75,6 +75,12 @@
ewarn
ebeep
fi
+
+ append-flags -fno-strict-aliasing
+
+ if use debug; then
+ append-cppflags -DSVN_DEBUG -DAP_DEBUG
+ fi
}
src_unpack() {
@@ -89,6 +95,9 @@
# Fix 2 messages in Polish translation. They will be fixed in 1.6.1.
sed -e "7420d;8586d" -i subversion/po/pl.po
+ # https://svn.collab.net/viewvc/svn?view=revision&revision=36742
+ sed -e 's/$SVN_APRUTIL_INCLUDES $SVN_DB_INCLUDES/$SVN_DB_INCLUDES $SVN_APRUTIL_INCLUDES/' -i build/ac-macros/berkeley-db.m4
+
sed -i \
-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
@@ -110,16 +119,26 @@
myconf="${myconf} --without-swig"
fi
- if use debug; then
- append-cppflags -DSVN_DEBUG -DAP_DEBUG
+ einfo
+ if [[ -z "${SVN_BDB_VERSION}" ]]; then
+ SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
+ einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
fi
+ einfo "Using Berkeley DB ${SVN_BDB_VERSION}"
+ einfo
- append-flags -fno-strict-aliasing
+ local apu_bdb_version="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libaprutil-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+ if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
+ eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
+ eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
+ eerror "Aborting to avoid possible run-time crashes."
+ die "Berkeley DB version mismatch"
+ fi
econf --libdir="/usr/$(get_libdir)" \
${myconf} \
$(use_with apache2 apxs "${APXS}") \
- $(use_with berkdb berkeley-db "db.h:$(db_includedir 2>/dev/null)::$(db_libname 2>/dev/null)") \
+ $(use_with berkdb berkeley-db "db.h:/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \
$(use_with ctypes-python ctypesgen /usr) \
$(use_enable dso runtime-module-search) \
$(use_with gnome-keyring) \
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-util/subversion: ChangeLog subversion-1.6.0.ebuild
@ 2009-03-22 18:32 Arfrever Frehtes Taifersar Arahesis (arfrever)
0 siblings, 0 replies; 4+ messages in thread
From: Arfrever Frehtes Taifersar Arahesis (arfrever) @ 2009-03-22 18:32 UTC (permalink / raw
To: gentoo-commits
arfrever 09/03/22 18:32:16
Modified: ChangeLog subversion-1.6.0.ebuild
Log:
Don't print messages related to Berkeley DB when USE="-berkdb".
(Portage version: 13142-svn/cvs/Linux x86_64)
Revision Changes Path
1.354 dev-util/subversion/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?rev=1.354&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?rev=1.354&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?r1=1.353&r2=1.354
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- ChangeLog 22 Mar 2009 14:40:03 -0000 1.353
+++ ChangeLog 22 Mar 2009 18:32:16 -0000 1.354
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/subversion
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.353 2009/03/22 14:40:03 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.354 2009/03/22 18:32:16 arfrever Exp $
+
+ 22 Mar 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ subversion-1.6.0.ebuild:
+ Don't print messages related to Berkeley DB when USE="-berkdb".
22 Mar 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
subversion-1.6.0.ebuild:
1.3 dev-util/subversion/subversion-1.6.0.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild?r1=1.2&r2=1.3
Index: subversion-1.6.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- subversion-1.6.0.ebuild 22 Mar 2009 14:40:03 -0000 1.2
+++ subversion-1.6.0.ebuild 22 Mar 2009 18:32:16 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v 1.2 2009/03/22 14:40:03 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v 1.3 2009/03/22 18:32:16 arfrever Exp $
EAPI="1"
@@ -119,20 +119,22 @@
myconf="${myconf} --without-swig"
fi
- einfo
- if [[ -z "${SVN_BDB_VERSION}" ]]; then
- SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
- einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
- fi
- einfo "Using Berkeley DB ${SVN_BDB_VERSION}"
- einfo
+ if use berkdb; then
+ einfo
+ if [[ -z "${SVN_BDB_VERSION}" ]]; then
+ SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
+ einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
+ fi
+ einfo "Using Berkeley DB ${SVN_BDB_VERSION}"
+ einfo
- local apu_bdb_version="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libaprutil-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
- if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
- eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
- eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
- eerror "Aborting to avoid possible run-time crashes."
- die "Berkeley DB version mismatch"
+ local apu_bdb_version="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libaprutil-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+ if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
+ eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
+ eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
+ eerror "Aborting to avoid possible run-time crashes."
+ die "Berkeley DB version mismatch"
+ fi
fi
econf --libdir="/usr/$(get_libdir)" \
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-util/subversion: ChangeLog subversion-1.6.0.ebuild
@ 2009-03-23 5:37 Jeroen Roovers (jer)
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers (jer) @ 2009-03-23 5:37 UTC (permalink / raw
To: gentoo-commits
jer 09/03/23 05:37:31
Modified: ChangeLog subversion-1.6.0.ebuild
Log:
Marked ~hppa (bug #263337).
(Portage version: 2.2_rc26/cvs/Linux i686)
Revision Changes Path
1.355 dev-util/subversion/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?rev=1.355&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?rev=1.355&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?r1=1.354&r2=1.355
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -r1.354 -r1.355
--- ChangeLog 22 Mar 2009 18:32:16 -0000 1.354
+++ ChangeLog 23 Mar 2009 05:37:31 -0000 1.355
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/subversion
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.354 2009/03/22 18:32:16 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.355 2009/03/23 05:37:31 jer Exp $
+
+ 23 Mar 2009; Jeroen Roovers <jer@gentoo.org> subversion-1.6.0.ebuild:
+ Marked ~hppa (bug #263337).
22 Mar 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
subversion-1.6.0.ebuild:
1.4 dev-util/subversion/subversion-1.6.0.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild?r1=1.3&r2=1.4
Index: subversion-1.6.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- subversion-1.6.0.ebuild 22 Mar 2009 18:32:16 -0000 1.3
+++ subversion-1.6.0.ebuild 23 Mar 2009 05:37:31 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v 1.3 2009/03/22 18:32:16 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v 1.4 2009/03/23 05:37:31 jer Exp $
EAPI="1"
@@ -14,7 +14,7 @@
LICENSE="Subversion"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~hppa"
IUSE="apache2 berkdb ctypes-python debug doc +dso emacs extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
RESTRICT="test"
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-util/subversion: ChangeLog subversion-1.6.0.ebuild
@ 2009-03-25 3:33 Joseph Jezak (josejx)
0 siblings, 0 replies; 4+ messages in thread
From: Joseph Jezak (josejx) @ 2009-03-25 3:33 UTC (permalink / raw
To: gentoo-commits
josejx 09/03/25 03:33:10
Modified: ChangeLog subversion-1.6.0.ebuild
Log:
Marked ~ppc for bug #263337.
(Portage version: 2.1.6.7/cvs/Linux x86_64)
Revision Changes Path
1.357 dev-util/subversion/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?rev=1.357&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?rev=1.357&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?r1=1.356&r2=1.357
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -r1.356 -r1.357
--- ChangeLog 24 Mar 2009 08:55:08 -0000 1.356
+++ ChangeLog 25 Mar 2009 03:33:10 -0000 1.357
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/subversion
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.356 2009/03/24 08:55:08 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.357 2009/03/25 03:33:10 josejx Exp $
+
+ 25 Mar 2009; Joseph Jezak <josejx@gentoo.org> subversion-1.6.0.ebuild:
+ Marked ~ppc for bug #263337.
24 Mar 2009; Benedikt Böhm <hollow@gentoo.org> metadata.xml:
remove myself from metadata.xml
1.5 dev-util/subversion/subversion-1.6.0.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild?r1=1.4&r2=1.5
Index: subversion-1.6.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- subversion-1.6.0.ebuild 23 Mar 2009 05:37:31 -0000 1.4
+++ subversion-1.6.0.ebuild 25 Mar 2009 03:33:10 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v 1.4 2009/03/23 05:37:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v 1.5 2009/03/25 03:33:10 josejx Exp $
EAPI="1"
@@ -14,7 +14,7 @@
LICENSE="Subversion"
SLOT="0"
-KEYWORDS="~amd64 ~hppa"
+KEYWORDS="~amd64 ~hppa ~ppc"
IUSE="apache2 berkdb ctypes-python debug doc +dso emacs extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
RESTRICT="test"
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-03-25 3:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-23 5:37 [gentoo-commits] gentoo-x86 commit in dev-util/subversion: ChangeLog subversion-1.6.0.ebuild Jeroen Roovers (jer)
-- strict thread matches above, loose matches on Subject: below --
2009-03-25 3:33 Joseph Jezak (josejx)
2009-03-22 18:32 Arfrever Frehtes Taifersar Arahesis (arfrever)
2009-03-22 14:40 Arfrever Frehtes Taifersar Arahesis (arfrever)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox