diff options
author | Paul de Vrieze <pauldv@gentoo.org> | 2003-05-06 09:57:14 +0000 |
---|---|---|
committer | Paul de Vrieze <pauldv@gentoo.org> | 2003-05-06 09:57:14 +0000 |
commit | 27e06deeeb4fbfa56a1140e2d38cb30d136281b3 (patch) | |
tree | 7ddc73456da962b62168dab83232eafb9e805341 /dev-util | |
parent | removed dep for ! winex-cvs (diff) | |
download | gentoo-2-27e06deeeb4fbfa56a1140e2d38cb30d136281b3.tar.gz gentoo-2-27e06deeeb4fbfa56a1140e2d38cb30d136281b3.tar.bz2 gentoo-2-27e06deeeb4fbfa56a1140e2d38cb30d136281b3.zip |
Change subversion ebuild to not build its own db4 if a db4 is allready merged
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/subversion/ChangeLog | 5 | ||||
-rw-r--r-- | dev-util/subversion/Manifest | 4 | ||||
-rw-r--r-- | dev-util/subversion/subversion-0.21.0-r1.ebuild | 60 |
3 files changed, 39 insertions, 30 deletions
diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog index c3806091fbe3..70cd11915c11 100644 --- a/dev-util/subversion/ChangeLog +++ b/dev-util/subversion/ChangeLog @@ -1,9 +1,12 @@ # ChangeLog for dev-util/subversion # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.11 2003/04/30 14:54:31 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.12 2003/05/06 09:57:05 pauldv Exp $ *subversion-0.21.0-r1 (30 Apr 2003) + 06 May 2003; Paul de Vrieze pauldv@gentoo.org subversion-0.21.0-r1.ebuild: + Make subversion use an allready merged db4 instead of its own + 30 Apr 2003; Paul de Vrieze pauldv@gentoo.org subversion-0.21.0-r1.ebuild: Made subversion use libtool.eclass, cleans up things quite a bit diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest index baf4d4b3c185..841650418b55 100644 --- a/dev-util/subversion/Manifest +++ b/dev-util/subversion/Manifest @@ -1,7 +1,7 @@ MD5 5a81f23433cf70576fec6ed89e379959 subversion-0.10_pre1.ebuild 8049 -MD5 e367bfbd00aab945e74e0940c935ee87 ChangeLog 1773 +MD5 9d8340c75305896fb01791569771c490 ChangeLog 1915 MD5 310e6fb9b0da60c44a6f2eb64985e17c subversion-0.20.1.ebuild 5562 -MD5 bb2009f7b25ee9fcc3816a9a87ba821b subversion-0.21.0-r1.ebuild 5660 +MD5 226ac76e3af10441d2ccbab0e75431e0 subversion-0.21.0-r1.ebuild 5716 MD5 40a470e507ad215c9d3efd106cb417cc subversion-0.21.0.ebuild 6490 MD5 8208be10eefcdc258afb4ca8d410a06c files/digest-subversion-0.10_pre1 446 MD5 8761867d2d9c80254eb9945021b552fa files/digest-subversion-0.20.1 132 diff --git a/dev-util/subversion/subversion-0.21.0-r1.ebuild b/dev-util/subversion/subversion-0.21.0-r1.ebuild index c4d8ce8988bb..e3aadd6c0ac6 100644 --- a/dev-util/subversion/subversion-0.21.0-r1.ebuild +++ b/dev-util/subversion/subversion-0.21.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.21.0-r1.ebuild,v 1.1 2003/04/30 14:54:31 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-0.21.0-r1.ebuild,v 1.2 2003/05/06 09:57:05 pauldv Exp $ inherit libtool @@ -46,37 +46,41 @@ pkg_setup() { src_unpack() { cd ${WORKDIR} unpack ${P}.tar.gz - unpack db-4.0.14.tar.gz + has_version =db-4* || ( + unpack db-4.0.14.tar.gz + ) cd ${S} } src_compile() { elibtoolize - cd ${S_DB} - ../dist/configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --datadir=/usr/share \ - --sysconfdir=/etc \ - --localstatedir=/var/lib \ - --disable-compat185 \ - --disable-cxx \ - --disable-tcl \ - --disable-java \ - --disable-shared \ - --with-uniquename - make || die "db make failed" - [ -e ${WORKDIR}/dbinst ] && rm -rf ${WORKDIR}/dbinst - mkdir -p ${WORKDIR}/dbinst/lib - make prefix=${WORKDIR}/dbinst install ||die - mkdir ${WORKDIR}/dbinst/include/db4 - cp ${WORKDIR}/dbinst/include/*.h ${WORKDIR}/dbinst/include/db4 - mv ${WORKDIR}/dbinst/lib/libdb.a ${WORKDIR}/dbinst/lib/libdb4.a - cat <<EOF >${WORKDIR}/dbinst/lib/libdb4.so + has_version =db-4* || ( + cd ${S_DB} + ../dist/configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --datadir=/usr/share \ + --sysconfdir=/etc \ + --localstatedir=/var/lib \ + --disable-compat185 \ + --disable-cxx \ + --disable-tcl \ + --disable-java \ + --disable-shared \ + --with-uniquename + make || die "db make failed" + [ -e ${WORKDIR}/dbinst ] && rm -rf ${WORKDIR}/dbinst + mkdir -p ${WORKDIR}/dbinst/lib + make prefix=${WORKDIR}/dbinst install ||die + mkdir ${WORKDIR}/dbinst/include/db4 + cp ${WORKDIR}/dbinst/include/*.h ${WORKDIR}/dbinst/include/db4 + mv ${WORKDIR}/dbinst/lib/libdb.a ${WORKDIR}/dbinst/lib/libdb4.a + cat <<EOF >${WORKDIR}/dbinst/lib/libdb4.so GROUP( ${WORKDIR}/dbinst/lib/libdb4.a /usr/lib/libdb.so) EOF + ) #no db4 cd ${S} use ssl && myconf="${myconf} --with-ssl" @@ -85,9 +89,9 @@ EOF use apache2 && myconf="${myconf} --with-apxs=/usr/sbin/apxs2 \ --with-apr=/usr --with-apr-util=/usr" use apache2 || myconf="${myconf} --without-apxs" + has_version =db-4* || myconf="${myconf} --with-berkely-db=${WORKDIR}/dbinst" LDFLAGS=${LDFLAGS} econf ${myconf} \ - --with-berkeley-db=${WORKDIR}/dbinst \ --with-neon=/usr \ --disable-mod-activation \ --with-python=/usr/bin/python \ @@ -108,8 +112,10 @@ src_install () { mkdir -p ${D}/etc/apache2/conf mkdir -p ${D}/etc/share - mkdir -p ${D}/usr/share/subversion/bin - cp ${WORKDIR}/dbinst/bin/* ${D}/usr/share/subversion/bin/ + has_version =db-4* || ( + mkdir -p ${D}/usr/share/subversion/bin + cp ${WORKDIR}/dbinst/bin/* ${D}/usr/share/subversion/bin/ + ) make DESTDIR=${D} install || die "Installation of subversion failed" make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D} || die "Installation of subversion python bindings failed" |