From 1fcb0d370d95f8fa8cb84c1623de6e7a155bd5c0 Mon Sep 17 00:00:00 2001 From: Paul de Vrieze Date: Wed, 31 Aug 2005 18:19:35 +0000 Subject: [PATCH] Fix the ebuild to use `get_libdir` instead of lib Package-Manager: portage-2.0.51.22-r2 --- dev-util/subversion/ChangeLog | 7 +++++- dev-util/subversion/Manifest | 6 ++--- .../subversion/subversion-1.2.3-r1.ebuild | 22 +++++++++---------- dev-util/subversion/subversion-1.2.3.ebuild | 22 +++++++++---------- 4 files changed, 31 insertions(+), 26 deletions(-) diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog index ec1347a2c414..c8ec71692f32 100644 --- a/dev-util/subversion/ChangeLog +++ b/dev-util/subversion/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/subversion # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.170 2005/08/27 20:21:20 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.171 2005/08/31 18:19:35 pauldv Exp $ + + 31 Aug 2005; Paul de Vrieze subversion-1.2.3.ebuild, + subversion-1.2.3-r1.ebuild: + Fix the ebuild to use `get_libdir` instead of lib. Thanks to seemant in bug + #104154 *subversion-1.2.3-r1 (27 Aug 2005) *subversion-1.2.3 (27 Aug 2005) diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest index 67acd1f02ee9..ef7a10e38d73 100644 --- a/dev-util/subversion/Manifest +++ b/dev-util/subversion/Manifest @@ -1,12 +1,12 @@ MD5 c60d28f0f833c15ac51412e104163f4b subversion-1.1.1-r3.ebuild 10930 -MD5 3a993880c4ac1c37f20524c5d4824315 ChangeLog 29746 +MD5 cd1d7b83c760f245329f206956f80697 ChangeLog 29941 MD5 06d037b094b22ff7e7111ddf0171aa36 subversion-1.0.9.ebuild 9497 MD5 76bbb2ff27f3d246e88e5bb81d35c82b subversion-1.1.4.ebuild 10287 -MD5 33e3683d39abe01638d8cb58052ce59e subversion-1.2.3-r1.ebuild 10754 +MD5 8c688f991aacd9613ee2177dafa82d71 subversion-1.2.3-r1.ebuild 10854 MD5 d4ce7ce93bd43506cec558ec1e3e361c subversion-1.1.3.ebuild 11414 MD5 95ec7f00d624ef03a2243693afecbda4 subversion-1.1.3-r1.ebuild 10162 MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222 -MD5 a539bd180da1e8f57760702980c41c31 subversion-1.2.3.ebuild 11654 +MD5 2cb04b59ecc7613ea4304f2efa280c66 subversion-1.2.3.ebuild 11784 MD5 dc21f7cf5911e8838bada6ea19c934f1 subversion-1.1.4-r1.ebuild 10380 MD5 4884915b3f085149db98b98242155e36 subversion-1.2.0.ebuild 10478 MD5 6cf68c816a49ee846823009ecea40e24 subversion-1.2.1.ebuild 10751 diff --git a/dev-util/subversion/subversion-1.2.3-r1.ebuild b/dev-util/subversion/subversion-1.2.3-r1.ebuild index c8d12d9fa68e..3783a2b24676 100644 --- a/dev-util/subversion/subversion-1.2.3-r1.ebuild +++ b/dev-util/subversion/subversion-1.2.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.2.3-r1.ebuild,v 1.1 2005/08/27 20:21:20 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.2.3-r1.ebuild,v 1.2 2005/08/31 18:19:35 pauldv Exp $ inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module @@ -108,7 +108,7 @@ src_compile() { # Also apparently the included apr has a libtool that doesn't like -L flags. # So not specifying it at all when not building apache modules and only # specify it for internal parts otherwise. - ( emake external-all && emake LT_LDFLAGS="-L${D}/usr/lib" local-all ) || die "make of subversion failed" + ( emake external-all && emake LT_LDFLAGS="-L${D}/usr/$(get_libdir)" local-all ) || die "make of subversion failed" if use python; then # Building fails without the apache apr-util as includes are wrong. @@ -142,29 +142,29 @@ src_compile() { src_install () { python_version - PYTHON_DIR=/usr/lib/python${PYVER} + PYTHON_DIR=/usr/$(get_libdir)/python${PYVER} make DESTDIR=${D} install || die "Installation of subversion failed" # This might not be necessary with the new install -# if [[ -e ${D}/usr/lib/apache2 ]]; then -# if [ "${APACHE2_MODULESDIR}" != "/usr/lib/apache2/modules" ]; then +# if [[ -e ${D}/usr/$(get_libdir)/apache2 ]]; then +# if [ "${APACHE2_MODULESDIR}" != "/usr/$(get_libdir)/apache2/modules" ]; then # mkdir -p ${D}/`dirname ${APACHE2_MODULESDIR}` -# mv ${D}/usr/lib/apache2/modules ${D}/${APACHE2_MODULESDIR} -# rmdir ${D}/usr/lib/apache2 2>/dev/null +# mv ${D}/usr/$(get_libdir)/apache2/modules ${D}/${APACHE2_MODULESDIR} +# rmdir ${D}/usr/$(get_libdir)/apache2 2>/dev/null # fi # fi dobin svn-config if use python; then - make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D} LD_LIBRARY_PATH="-L${D}/usr/lib" || die "Installation of subversion python bindings failed" + make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D} LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" || die "Installation of subversion python bindings failed" # move python bindings mkdir -p ${D}${PYTHON_DIR}/site-packages - mv ${D}/usr/lib/svn-python/svn ${D}${PYTHON_DIR}/site-packages - mv ${D}/usr/lib/svn-python/libsvn ${D}${PYTHON_DIR}/site-packages - rmdir ${D}/usr/lib/svn-python + mv ${D}/usr/$(get_libdir)/svn-python/svn ${D}${PYTHON_DIR}/site-packages + mv ${D}/usr/$(get_libdir)/svn-python/libsvn ${D}${PYTHON_DIR}/site-packages + rmdir ${D}/usr/$(get_libdir)/svn-python fi if use perl; then make DESTDIR=${D} install-swig-pl || die "Perl library building failed" diff --git a/dev-util/subversion/subversion-1.2.3.ebuild b/dev-util/subversion/subversion-1.2.3.ebuild index 8d50c4765012..9e965324d3d9 100644 --- a/dev-util/subversion/subversion-1.2.3.ebuild +++ b/dev-util/subversion/subversion-1.2.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.2.3.ebuild,v 1.1 2005/08/27 20:21:20 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.2.3.ebuild,v 1.2 2005/08/31 18:19:35 pauldv Exp $ inherit elisp-common libtool python eutils bash-completion flag-o-matic perl-module @@ -125,7 +125,7 @@ src_compile() { # So not specifying it at all when not building apache modules and only # specify it for internal parts otherwise. if use apache2; then - ( emake LT_LDFLAGS="-L${D}/usr/lib" external-all && emake LT_LDFLAGS="-L${D}/usr/lib" local-all ) || die "make of subversion failed" + ( emake LT_LDFLAGS="-L${D}/usr/$(get_libdir)" external-all && emake LT_LDFLAGS="-L${D}/usr/$(get_libdir)" local-all ) || die "make of subversion failed" else ( emake external-all && emake local-all ) || die "make of subversion failed" fi @@ -168,15 +168,15 @@ src_install () { use apache2 && mkdir -p ${D}/etc/apache2/conf python_version - PYTHON_DIR=/usr/lib/python${PYVER} + PYTHON_DIR=/usr/$(get_libdir)/python${PYVER} make DESTDIR=${D} install || die "Installation of subversion failed" - if [[ -e ${D}/usr/lib/apache2 ]]; then + if [[ -e ${D}/usr/$(get_libdir)/apache2 ]]; then if has_version '>=net-www/apache-2.0.48-r2'; then - mv ${D}/usr/lib/apache2/modules ${D}/usr/lib/apache2-extramodules - rmdir ${D}/usr/lib/apache2 + mv ${D}/usr/$(get_libdir)/apache2/modules ${D}/usr/$(get_libdir)/apache2-extramodules + rmdir ${D}/usr/$(get_libdir)/apache2 else - mv ${D}/usr/lib/apache2 ${D}/usr/lib/apache2-extramodules + mv ${D}/usr/$(get_libdir)/apache2 ${D}/usr/$(get_libdir)/apache2-extramodules fi fi @@ -187,13 +187,13 @@ src_install () { dobin svn-config if use python; then - make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D} LD_LIBRARY_PATH="-L${D}/usr/lib" || die "Installation of subversion python bindings failed" + make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D} LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" || die "Installation of subversion python bindings failed" # move python bindings mkdir -p ${D}${PYTHON_DIR}/site-packages - mv ${D}/usr/lib/svn-python/svn ${D}${PYTHON_DIR}/site-packages - mv ${D}/usr/lib/svn-python/libsvn ${D}${PYTHON_DIR}/site-packages - rmdir ${D}/usr/lib/svn-python + mv ${D}/usr/$(get_libdir)/svn-python/svn ${D}${PYTHON_DIR}/site-packages + mv ${D}/usr/$(get_libdir)/svn-python/libsvn ${D}${PYTHON_DIR}/site-packages + rmdir ${D}/usr/$(get_libdir)/svn-python fi if use perl; then make DESTDIR=${D} install-swig-pl || die "Perl library building failed" -- 2.26.2