Use "nosmart" URI for initial branching. Merge changes from Emacs overlay.

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 28 insertions, 25 deletions

diff --git a/app-editors/emacs-vcs/ChangeLog b/app-editors/emacs-vcs/ChangeLog
index fee70aa26aa3..630b4d3a797a 100644
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.50 2011/03/01 06:10:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.51 2011/03/05 11:23:10 ulm Exp $
+
+  05 Mar 2011; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.3.9999.ebuild,
+  emacs-vcs-24.0.9999-r1.ebuild:
+  Use "nosmart" URI for initial branching. Merge changes from Emacs overlay.
 
 *emacs-vcs-23.3.9999 (01 Mar 2011)
 
diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index bccc27405227..069b27d3e619 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -7,14 +7,14 @@ DIST emacs-23.2.94.tar.gz 47664845 RMD160 1c7088688f271836c3bd9a743ec9fe7bb1e012
 EBUILD emacs-vcs-23.2.92.ebuild 9960 RMD160 8d40053abe474160a6800d822028360ae6a1958c SHA1 e9d7169ecdb75ed38f4bd5f1c5a891e70cd8af43 SHA256 1bf59c7aa25a7cc25f1a1827d18a60ea02f08ddcb6f34c548792739542ba848c
 EBUILD emacs-vcs-23.2.93.ebuild 10179 RMD160 56c1f66e633254ff21ec3856265e477ae7dbd84d SHA1 bd8d48f525ecf03143c0f3dbaf06c4d571f17500 SHA256 3239f653cabdf117050b57d655b0d34877fc9317f8f779468ef9396c2ea7686a
 EBUILD emacs-vcs-23.2.94.ebuild 10151 RMD160 494bbbf27563ae46aa32ab7a9ada5a8fe7400b78 SHA1 47fe5d907bc95b152c790452872d705ed1edb02f SHA256 46df1903e6410108364e2858992babb1652c5cbfa96e72675918e5c65d140f85
-EBUILD emacs-vcs-23.3.9999.ebuild 10433 RMD160 65c8fb50376df3c97b83c3036928f582e22d80e4 SHA1 a6e845a71866a1d940b6f9709f57777bf074bb96 SHA256 eb59d9708b91c5f3c39d8ecf11c78e79183966c8068d31fd06cba6cef68736b1
-EBUILD emacs-vcs-24.0.9999-r1.ebuild 10662 RMD160 adb88717966f08c38c1864c96b0452821b186b5d SHA1 50f4d0a72f9e0bd0c691265729ac458bcb341864 SHA256 bbce0072dfb7efb745b84d37cbc070fcfec00c87c81ac37372c3d671611eac14
-MISC ChangeLog 57598 RMD160 0066b4358ea69f2df69d3c9292a83a59bc6b219d SHA1 ab3a45371aa3642b9a58f7be225715d5ee9e2d2f SHA256 1b8386347c3e44cb238727e34dd4668eb8800dcfaf93376ce3a788144016b721
+EBUILD emacs-vcs-23.3.9999.ebuild 10447 RMD160 43f86d25818779ff9d3b293b3269b87fb762730d SHA1 ea01f4e9d73195dd8bdb9bde3db61e06e150c6f2 SHA256 c46303afe7eef49134aa3d5444124bfec74d068e5774aed76e293964d42d24fb
+EBUILD emacs-vcs-24.0.9999-r1.ebuild 10586 RMD160 98d4feafd24eb0d9ce85a763e98aaaccd53692ca SHA1 690006d6ff9cded38f59f7bd9780b875dc98a099 SHA256 6f7596f320a011598e4ab586db5683b9233edad4e3c49b3fd1a3da9bbd5439d4
+MISC ChangeLog 57784 RMD160 c8aa1de38cc46d6cc4c8e1dd44e1475fd800484e SHA1 f95419e5d4961a2ca6102dbcdbe7cb1e052769ab SHA256 3adb349ebda5f1fc0c462895db9e61287c1b61abf8d32c403469f8cbf3244249
 MISC metadata.xml 1801 RMD160 606c780a3e86f485699157f14a35ca0e5da1d3c2 SHA1 05839ee25c6f6389e8eb80d783df895d59600a90 SHA256 bdc233a1795f52900dbe4d0a39c0e56d4eb5ba1c4842b9c46bae47f7052d5d74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1s9KAACgkQOeoy/oIi7uy48ACeJ5fCq3nhTdE205a0Jn0P3dDh
-hLAAn2DoRkbIkrug9oHQQvclyhGcXKlY
-=Qjnh
+iEUEARECAAYFAk1yHrcACgkQOeoy/oIi7ux7XQCXRdbHWRr1ehkBzRi/V+JeSy6U
+IwCfc9OhzdjJ3BUc2eGcMfXct0nePSc=
+=/qK5
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild b/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild
index bcbde023a42c..86e26128e246 100644
--- a/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-23.3.9999.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/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild,v 1.2 2011/03/01 13:22:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild,v 1.3 2011/03/05 11:23:10 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -11,6 +11,8 @@ if [ "${PV##*.}" = "9999" ]; then
 	EBZR_PROJECT="emacs"
 	EBZR_BRANCH="emacs-23"
 	EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/"
+	# "Nosmart" is much faster for initial branching.
+	EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}"
 	inherit bzr
 	SRC_URI=""
 else
@@ -98,8 +100,6 @@ src_prepare() {
 		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
 			|| die "Upstream version number changed to ${FULL_VERSION}"
 		echo
-	#else
-	#	EPATCH_SUFFIX=patch epatch
 	fi
 
 	sed -i \
@@ -195,10 +195,6 @@ src_configure() {
 		myconf="${myconf} --without-x"
 	fi
 
-	myconf="${myconf} $(use_with hesiod)"
-	myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
-	myconf="${myconf} $(use_with gpm) $(use_with dbus)"
-
 	# According to configure, this option is only used for GNU/Linux
 	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
 	# out the location because $(get_libdir) does not necessarily return
@@ -210,6 +206,10 @@ src_configure() {
 		--program-suffix=-${EMACS_SUFFIX} \
 		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
 		--with-crt-dir="${crtdir}" \
+		$(use_with hesiod) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with gpm) \
+		$(use_with dbus) \
 		${myconf}
 }
 
diff --git a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild
index 52c402137c20..05b6c928b62c 100644
--- a/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.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/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild,v 1.7 2011/02/28 16:31:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r1.ebuild,v 1.8 2011/03/05 11:23:10 ulm Exp $
 
 EAPI=4
 
@@ -10,8 +10,8 @@ if [ "${PV##*.}" = "9999" ]; then
 	EBZR_PROJECT="emacs"
 	EBZR_BRANCH="trunk"
 	EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EBZR_BRANCH}/"
-	# The mirror at launchpad has much better performance.
-	EBZR_INITIAL_URI="lp:emacs"
+	# "Nosmart" is much faster for initial branching.
+	EBZR_INITIAL_URI="nosmart+${EBZR_REPO_URI}"
 	inherit bzr
 	SRC_URI=""
 else
@@ -99,11 +99,9 @@ src_prepare() {
 		echo
 		einfo "Emacs branch: ${EBZR_BRANCH}"
 		einfo "Emacs version number: ${FULL_VERSION}"
-		[ "${FULL_VERSION%.*}" = ${PV%.*} ] \
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
 			|| die "Upstream version number changed to ${FULL_VERSION}"
 		echo
-	#else
-	#	EPATCH_SUFFIX=patch epatch
 	fi
 
 	if ! use alsa; then
@@ -194,11 +192,6 @@ src_configure() {
 		myconf="${myconf} --without-x"
 	fi
 
-	myconf="${myconf} $(use_with hesiod)"
-	myconf="${myconf} $(use_with kerberos) $(use_with kerberos kerberos5)"
-	myconf="${myconf} $(use_with gpm) $(use_with dbus)"
-	myconf="${myconf} $(use_with gnutls) $(use_with selinux)"
-
 	# According to configure, this option is only used for GNU/Linux
 	# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
 	# out the location because $(get_libdir) does not necessarily return
@@ -212,6 +205,12 @@ src_configure() {
 		--with-crt-dir="${crtdir}" \
 		--with-gameuser="${GAMES_USER_DED:-games}" \
 		--without-compress-info \
+		$(use_with hesiod) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with gpm) \
+		$(use_with dbus) \
+		$(use_with gnutls) \
+		$(use_with selinux) \
 		${myconf}
 }