diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2011-11-30 14:28:49 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2011-11-30 14:28:49 +0000 |
| commit | e76c3635fa79ee900a41c4922ec8b933910c22f8 (patch) | |
| tree | 9c9c39184357d3769a51726de15fe834fea8b207 /dev-vcs/subversion | |
| parent | update thmtools to v59, by Martin von Gagern in bug #377247 (diff) | |
| download | gentoo-2-e76c3635fa79ee900a41c4922ec8b933910c22f8.tar.gz gentoo-2-e76c3635fa79ee900a41c4922ec8b933910c22f8.tar.bz2 gentoo-2-e76c3635fa79ee900a41c4922ec8b933910c22f8.zip | |
Use get_libname instead of hardcoding .so for shared libraries for Darwin, by nietonfir in bug #388275
(Portage version: 2.2.01.19572-prefix/cvs/Darwin i386)
Diffstat (limited to 'dev-vcs/subversion')
| -rw-r--r-- | dev-vcs/subversion/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-vcs/subversion/subversion-1.7.1.ebuild | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog index 2197d21898d0..813e71663d29 100644 --- a/dev-vcs/subversion/ChangeLog +++ b/dev-vcs/subversion/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-vcs/subversion # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.66 2011/11/06 16:07:18 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.67 2011/11/30 14:28:49 grobian Exp $ + + 30 Nov 2011; Fabian Groffen <grobian@gentoo.org> subversion-1.7.1.ebuild: + Use get_libname instead of hardcoding .so for shared libraries for Darwin, by + nietonfir in bug #388275 06 Nov 2011; Brent Baude <ranger@gentoo.org> subversion-1.6.17-r7.ebuild: Marking subversion-1.6.17-r7 ppc for bug 386899 diff --git a/dev-vcs/subversion/subversion-1.7.1.ebuild b/dev-vcs/subversion/subversion-1.7.1.ebuild index 5c23b0647235..37fdecd47a69 100644 --- a/dev-vcs/subversion/subversion-1.7.1.ebuild +++ b/dev-vcs/subversion/subversion-1.7.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.1.ebuild,v 1.1 2011/10/26 14:31:06 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.1.ebuild,v 1.2 2011/11/30 14:28:49 grobian Exp $ EAPI="3" SUPPORT_PYTHON_ABIS="1" @@ -297,7 +297,7 @@ src_install() { if use java; then emake DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed" - java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*.so + java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname) java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar fi @@ -363,8 +363,8 @@ EOF pkg_preinst() { # Compare versions of Berkeley DB, bug 122877. if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]]; then - OLD_BDB_VERSION="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" - NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" + 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/")" + 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/")" if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]]; then CHANGED_BDB_VERSION="1" fi |