public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-util/subversion: subversion-1.4.6.ebuild subversion-1.4.5.ebuild ChangeLog
@ 2008-01-27 21:10 Benedikt Boehm (hollow)
  0 siblings, 0 replies; 2+ messages in thread
From: Benedikt Boehm (hollow) @ 2008-01-27 21:10 UTC (permalink / raw
  To: gentoo-commits

hollow      08/01/27 21:10:50

  Modified:             subversion-1.4.6.ebuild subversion-1.4.5.ebuild
                        ChangeLog
  Log:
  remove obsolete apr_config/apu_config
  (Portage version: 2.1.4)

Revision  Changes    Path
1.5                  dev-util/subversion/subversion-1.4.6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild?r1=1.4&r2=1.5

Index: subversion-1.4.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- subversion-1.4.6.ebuild	27 Jan 2008 18:24:14 -0000	1.4
+++ subversion-1.4.6.ebuild	27 Jan 2008 21:10:49 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild,v 1.4 2008/01/27 18:24:14 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild,v 1.5 2008/01/27 21:10:49 hollow Exp $
 
 inherit bash-completion depend.apache flag-o-matic elisp-common eutils java-pkg-opt-2 libtool multilib perl-module python
 
@@ -84,8 +84,8 @@
 	sed -e 's/\(NEON_ALLOWED_LIST=.* 0.26.2\)"/\1 0.26.3 0.26.4"/' \
 		-i configure.in
 
-	sed -e "s:apr-config:$(apr_config):g" \
-		-e "s:apu-config:$(apu_config):g" \
+	sed -e "s:apr-config:apr-1-config:g" \
+		-e "s:apu-config:apu-1-config:g" \
 		-i build/ac-macros/{find_,}ap*
 
 	export WANT_AUTOCONF=2.5
@@ -116,11 +116,11 @@
 		myconf="${myconf} --with-neon=/usr"
 	fi
 
-	append-flags $(/usr/bin/$(apr_config) --cppflags)
+	append-flags $(/usr/bin/apr-1-config --cppflags)
 
 	econf ${myconf} \
-		--with-apr=/usr/bin/$(apr_config) \
-		--with-apr-util=/usr/bin/$(apu_config) \
+		--with-apr=/usr/bin/apr-1-config \
+		--with-apr-util=/usr/bin/apu-1-config \
 		$(use_with apache2 apxs ${APXS2}) \
 		$(use_with berkdb berkeley-db) \
 		$(use_enable debug maintainer-mode) \



1.11                 dev-util/subversion/subversion-1.4.5.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.4.5.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.4.5.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.4.5.ebuild?r1=1.10&r2=1.11

Index: subversion-1.4.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.5.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- subversion-1.4.5.ebuild	27 Jan 2008 18:24:14 -0000	1.10
+++ subversion-1.4.5.ebuild	27 Jan 2008 21:10:49 -0000	1.11
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.5.ebuild,v 1.10 2008/01/27 18:24:14 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.5.ebuild,v 1.11 2008/01/27 21:10:49 hollow Exp $
 
 inherit bash-completion depend.apache flag-o-matic elisp-common eutils java-pkg-opt-2 libtool multilib perl-module python
 
@@ -84,8 +84,8 @@
 	sed -e 's/\(NEON_ALLOWED_LIST=.* 0.26.2\)"/\1 0.26.3 0.26.4"/' \
 		-i configure.in
 
-	sed -e "s:apr-config:$(apr_config):g" \
-		-e "s:apu-config:$(apu_config):g" \
+	sed -e "s:apr-config:apr-1-config:g" \
+		-e "s:apu-config:apu-1-config:g" \
 		-i build/ac-macros/{find_,}ap*
 
 	export WANT_AUTOCONF=2.5
@@ -116,11 +116,11 @@
 		myconf="${myconf} --with-neon=/usr"
 	fi
 
-	append-flags $(/usr/bin/$(apr_config) --cppflags)
+	append-flags $(/usr/bin/apr-1-config --cppflags)
 
 	econf ${myconf} \
-		--with-apr=/usr/bin/$(apr_config) \
-		--with-apr-util=/usr/bin/$(apu_config) \
+		--with-apr=/usr/bin/apr-1-config \
+		--with-apr-util=/usr/bin/apu-1-config \
 		$(use_with apache2 apxs ${APXS2}) \
 		$(use_with berkdb berkeley-db) \
 		$(use_enable debug maintainer-mode) \



1.289                dev-util/subversion/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?rev=1.289&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?rev=1.289&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?r1=1.288&r2=1.289

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- ChangeLog	27 Jan 2008 18:24:14 -0000	1.288
+++ ChangeLog	27 Jan 2008 21:10:49 -0000	1.289
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.288 2008/01/27 18:24:14 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.289 2008/01/27 21:10:49 hollow Exp $
+
+  27 Jan 2008; Benedikt Böhm <hollow@gentoo.org> subversion-1.4.5.ebuild,
+  subversion-1.4.6.ebuild:
+  remove obsolete apr_config/apu_config
 
   27 Jan 2008; Benedikt Böhm <hollow@gentoo.org>
   -files/subversion-1.3.1-neon-0.26.patch, -files/subversion-db4.patch,



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-util/subversion: subversion-1.4.6.ebuild subversion-1.4.5.ebuild ChangeLog
@ 2008-01-29 15:33 Benedikt Boehm (hollow)
  0 siblings, 0 replies; 2+ messages in thread
From: Benedikt Boehm (hollow) @ 2008-01-29 15:33 UTC (permalink / raw
  To: gentoo-commits

hollow      08/01/29 15:33:43

  Modified:             subversion-1.4.6.ebuild subversion-1.4.5.ebuild
                        ChangeLog
  Log:
  fix depend.apache usage wrt #208033
  (Portage version: 2.1.4)

Revision  Changes    Path
1.8                  dev-util/subversion/subversion-1.4.6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild?r1=1.7&r2=1.8

Index: subversion-1.4.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- subversion-1.4.6.ebuild	28 Jan 2008 12:23:41 -0000	1.7
+++ subversion-1.4.6.ebuild	29 Jan 2008 15:33:42 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild,v 1.7 2008/01/28 12:23:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild,v 1.8 2008/01/29 15:33:42 hollow Exp $
 
 inherit bash-completion depend.apache flag-o-matic elisp-common eutils java-pkg-opt-2 libtool multilib perl-module python
 
@@ -121,7 +121,7 @@
 	econf ${myconf} \
 		--with-apr=/usr/bin/apr-1-config \
 		--with-apr-util=/usr/bin/apu-1-config \
-		$(use_with apache2 apxs ${APXS2}) \
+		$(use_with apache2 apxs ${APXS}) \
 		$(use_with berkdb berkeley-db) \
 		$(use_enable debug maintainer-mode) \
 		$(use_enable nls) \
@@ -208,9 +208,9 @@
 
 	# Install apache2 module config
 	if use apache2 ; then
-		MOD="${APACHE2_MODULESDIR/${APACHE2_BASEDIR}\//}"
-		dodir "${APACHE2_MODULES_CONFDIR}"
-		cat <<EOF >"${D}/${APACHE2_MODULES_CONFDIR}"/47_mod_dav_svn.conf
+		MOD="${APACHE_MODULESDIR/${APACHE_BASEDIR}\//}"
+		dodir "${APACHE_MODULES_CONFDIR}"
+		cat <<EOF >"${D}/${APACHE_MODULES_CONFDIR}"/47_mod_dav_svn.conf
 <IfDefine SVN>
 	<IfModule !mod_dav_svn.c>
 		LoadModule dav_svn_module	${MOD}/mod_dav_svn.so



1.12                 dev-util/subversion/subversion-1.4.5.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.4.5.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.4.5.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/subversion-1.4.5.ebuild?r1=1.11&r2=1.12

Index: subversion-1.4.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.5.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- subversion-1.4.5.ebuild	27 Jan 2008 21:10:49 -0000	1.11
+++ subversion-1.4.5.ebuild	29 Jan 2008 15:33:42 -0000	1.12
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.5.ebuild,v 1.11 2008/01/27 21:10:49 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.5.ebuild,v 1.12 2008/01/29 15:33:42 hollow Exp $
 
 inherit bash-completion depend.apache flag-o-matic elisp-common eutils java-pkg-opt-2 libtool multilib perl-module python
 
@@ -121,7 +121,7 @@
 	econf ${myconf} \
 		--with-apr=/usr/bin/apr-1-config \
 		--with-apr-util=/usr/bin/apu-1-config \
-		$(use_with apache2 apxs ${APXS2}) \
+		$(use_with apache2 apxs ${APXS}) \
 		$(use_with berkdb berkeley-db) \
 		$(use_enable debug maintainer-mode) \
 		$(use_enable nls) \
@@ -208,9 +208,9 @@
 
 	# Install apache2 module config
 	if use apache2 ; then
-		MOD="${APACHE2_MODULESDIR/${APACHE2_BASEDIR}\//}"
-		dodir "${APACHE2_MODULES_CONFDIR}"
-		cat <<EOF >"${D}/${APACHE2_MODULES_CONFDIR}"/47_mod_dav_svn.conf
+		MOD="${APACHE_MODULESDIR/${APACHE_BASEDIR}\//}"
+		dodir "${APACHE_MODULES_CONFDIR}"
+		cat <<EOF >"${D}/${APACHE_MODULES_CONFDIR}"/47_mod_dav_svn.conf
 <IfDefine SVN>
 	<IfModule !mod_dav_svn.c>
 		LoadModule dav_svn_module	${MOD}/mod_dav_svn.so



1.292                dev-util/subversion/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?rev=1.292&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?rev=1.292&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/subversion/ChangeLog?r1=1.291&r2=1.292

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -r1.291 -r1.292
--- ChangeLog	28 Jan 2008 12:23:41 -0000	1.291
+++ ChangeLog	29 Jan 2008 15:33:42 -0000	1.292
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.291 2008/01/28 12:23:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.292 2008/01/29 15:33:42 hollow Exp $
+
+  29 Jan 2008; Benedikt Böhm <hollow@gentoo.org> subversion-1.4.5.ebuild,
+  subversion-1.4.6.ebuild:
+  fix depend.apache usage wrt #208033
 
   28 Jan 2008; Raúl Porcel <armin76@gentoo.org> subversion-1.4.6.ebuild:
   alpha/ia64/sparc/x86 stable wrt #207572



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-01-29 15:33 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-29 15:33 [gentoo-commits] gentoo-x86 commit in dev-util/subversion: subversion-1.4.6.ebuild subversion-1.4.5.ebuild ChangeLog Benedikt Boehm (hollow)
  -- strict thread matches above, loose matches on Subject: below --
2008-01-27 21:10 Benedikt Boehm (hollow)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox