| 1 |
grobian 11/11/30 14:28:49 |
| 2 |
|
| 3 |
Modified: subversion-1.7.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Use get_libname instead of hardcoding .so for shared libraries for Darwin, by nietonfir in bug #388275 |
| 6 |
|
| 7 |
(Portage version: 2.2.01.19572-prefix/cvs/Darwin i386) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-vcs/subversion/subversion-1.7.1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/subversion-1.7.1.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/subversion-1.7.1.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/subversion-1.7.1.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: subversion-1.7.1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.1.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- subversion-1.7.1.ebuild 26 Oct 2011 14:31:06 -0000 1.1 |
| 23 |
+++ subversion-1.7.1.ebuild 30 Nov 2011 14:28:49 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2011 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.1.ebuild,v 1.1 2011/10/26 14:31:06 chainsaw Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.1.ebuild,v 1.2 2011/11/30 14:28:49 grobian Exp $ |
| 29 |
|
| 30 |
EAPI="3" |
| 31 |
SUPPORT_PYTHON_ABIS="1" |
| 32 |
@@ -297,7 +297,7 @@ |
| 33 |
|
| 34 |
if use java; then |
| 35 |
emake DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed" |
| 36 |
- java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*.so |
| 37 |
+ java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname) |
| 38 |
java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar |
| 39 |
rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar |
| 40 |
fi |
| 41 |
@@ -363,8 +363,8 @@ |
| 42 |
pkg_preinst() { |
| 43 |
# Compare versions of Berkeley DB, bug 122877. |
| 44 |
if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]]; then |
| 45 |
- OLD_BDB_VERSION="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" |
| 46 |
- NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" |
| 47 |
+ OLD_BDB_VERSION="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" |
| 48 |
+ NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" |
| 49 |
if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]]; then |
| 50 |
CHANGED_BDB_VERSION="1" |
| 51 |
fi |
| 52 |
|
| 53 |
|
| 54 |
|
| 55 |
1.67 dev-vcs/subversion/ChangeLog |
| 56 |
|
| 57 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/ChangeLog?rev=1.67&view=markup |
| 58 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/ChangeLog?rev=1.67&content-type=text/plain |
| 59 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/subversion/ChangeLog?r1=1.66&r2=1.67 |
| 60 |
|
| 61 |
Index: ChangeLog |
| 62 |
=================================================================== |
| 63 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v |
| 64 |
retrieving revision 1.66 |
| 65 |
retrieving revision 1.67 |
| 66 |
diff -u -r1.66 -r1.67 |
| 67 |
--- ChangeLog 6 Nov 2011 16:07:18 -0000 1.66 |
| 68 |
+++ ChangeLog 30 Nov 2011 14:28:49 -0000 1.67 |
| 69 |
@@ -1,6 +1,10 @@ |
| 70 |
# ChangeLog for dev-vcs/subversion |
| 71 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 72 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.66 2011/11/06 16:07:18 ranger Exp $ |
| 73 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.67 2011/11/30 14:28:49 grobian Exp $ |
| 74 |
+ |
| 75 |
+ 30 Nov 2011; Fabian Groffen <grobian@g.o> subversion-1.7.1.ebuild: |
| 76 |
+ Use get_libname instead of hardcoding .so for shared libraries for Darwin, by |
| 77 |
+ nietonfir in bug #388275 |
| 78 |
|
| 79 |
06 Nov 2011; Brent Baude <ranger@g.o> subversion-1.6.17-r7.ebuild: |
| 80 |
Marking subversion-1.6.17-r7 ppc for bug 386899 |
Archives