public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in eclass: bzr.eclass ChangeLog
@ 2012-07-18 15:12 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Mueller (ulm) @ 2012-07-18 15:12 UTC (permalink / raw
  To: gentoo-commits

ulm         12/07/18 15:12:55

  Modified:             bzr.eclass ChangeLog
  Log:
  Don't assign useless values to DESCRIPTION and HOMEPAGE variables.

Revision  Changes    Path
1.18                 eclass/bzr.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bzr.eclass?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bzr.eclass?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bzr.eclass?r1=1.17&r2=1.18

Index: bzr.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/bzr.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bzr.eclass	22 Sep 2011 08:13:09 -0000	1.17
+++ bzr.eclass	18 Jul 2012 15:12:54 -0000	1.18
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/bzr.eclass,v 1.17 2011/09/22 08:13:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bzr.eclass,v 1.18 2012/07/18 15:12:54 ulm Exp $
 #
 # @ECLASS: bzr.eclass
 # @MAINTAINER:
@@ -29,9 +29,6 @@
 	*)   EXPORT_FUNCTIONS src_unpack src_prepare ;;
 esac
 
-HOMEPAGE="http://bazaar-vcs.org/"
-DESCRIPTION="Based on the ${EBZR} eclass"
-
 DEPEND=">=dev-vcs/bzr-2.0.1"
 case "${EAPI:-0}" in
 	0|1) ;;



1.342                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.342&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.342&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.341&r2=1.342

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -r1.341 -r1.342
--- ChangeLog	17 Jul 2012 03:56:26 -0000	1.341
+++ ChangeLog	18 Jul 2012 15:12:54 -0000	1.342
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.341 2012/07/17 03:56:26 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.342 2012/07/18 15:12:54 ulm Exp $
+
+  18 Jul 2012; Ulrich Müller <ulm@gentoo.org> bzr.eclass:
+  Don't assign useless values to DESCRIPTION and HOMEPAGE variables.
 
   17 Jul 2012; Mike Gilbert <floppym@gentoo.org> chromium.eclass:
   Remove -v option from rm command.






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

* [gentoo-commits] gentoo-x86 commit in eclass: bzr.eclass ChangeLog
@ 2012-09-18  6:41 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Mueller (ulm) @ 2012-09-18  6:41 UTC (permalink / raw
  To: gentoo-commits

ulm         12/09/18 06:41:45

  Modified:             bzr.eclass ChangeLog
  Log:
  Use lightweight checkout instead of export if EBZR_WORKDIR_CHECKOUT is set; bug 434746. Remove old cleanup code.

Revision  Changes    Path
1.19                 eclass/bzr.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bzr.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bzr.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bzr.eclass?r1=1.18&r2=1.19

Index: bzr.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/bzr.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bzr.eclass	18 Jul 2012 15:12:54 -0000	1.18
+++ bzr.eclass	18 Sep 2012 06:41:45 -0000	1.19
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/bzr.eclass,v 1.18 2012/07/18 15:12:54 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bzr.eclass,v 1.19 2012/09/18 06:41:45 ulm Exp $
 #
 # @ECLASS: bzr.eclass
 # @MAINTAINER:
@@ -61,6 +61,11 @@
 # The Bazaar command to export a branch.
 : ${EBZR_EXPORT_CMD:="bzr export"}
 
+# @ECLASS-VARIABLE: EBZR_CHECKOUT_CMD
+# @DESCRIPTION:
+# The Bazaar command to checkout a branch.
+: ${EBZR_CHECKOUT_CMD:="bzr checkout --lightweight -q"}
+
 # @ECLASS-VARIABLE: EBZR_REVNO_CMD
 # @DESCRIPTION:
 # The Bazaar command to list a revision number of the branch.
@@ -145,6 +150,12 @@
 # by users.
 : ${EBZR_OFFLINE=${EVCS_OFFLINE}}
 
+# @ECLASS-VARIABLE: EBZR_WORKDIR_CHECKOUT
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# If this variable is set to a non-empty value, EBZR_CHECKOUT_CMD will
+# be used instead of EBZR_EXPORT_CMD to copy the sources to WORKDIR.
+
 # @FUNCTION: bzr_initial_fetch
 # @USAGE: <repository URI> <branch directory>
 # @DESCRIPTION:
@@ -196,11 +207,11 @@
 # working copy.
 bzr_fetch() {
 	local repo_dir branch_dir
+	local save_sandbox_write=${SANDBOX_WRITE}
 
 	[[ -n ${EBZR_REPO_URI} ]] || die "${EBZR}: EBZR_REPO_URI is empty"
 
 	if [[ ! -d ${EBZR_STORE_DIR} ]] ; then
-		local save_sandbox_write=${SANDBOX_WRITE}
 		addwrite /
 		mkdir -p "${EBZR_STORE_DIR}" \
 			|| die "${EBZR}: can't mkdir ${EBZR_STORE_DIR}"
@@ -215,19 +226,6 @@
 
 	addwrite "${EBZR_STORE_DIR}"
 
-	# Clean up if the existing local copy is a checkout (as was the case
-	# with an older version of bzr.eclass).
-	# This test can be removed after 1 Mar 2012.
-	if [[ ${EBZR_FETCH_CMD} != *checkout* && -d ${repo_dir}/.bzr/checkout ]]
-	then
-		local tmpname=$(mktemp -u "${repo_dir}._old_.XXXXXX")
-		ewarn "checkout from old version of ${EBZR} found, moving it to:"
-		ewarn "${tmpname}"
-		ewarn "you may manually remove it"
-		mv "${repo_dir}" "${tmpname}" \
-			|| die "${EBZR}: can't move old checkout out of the way"
-	fi
-
 	if [[ ! -d ${branch_dir}/.bzr ]]; then
 		if [[ ${repo_dir} != "${branch_dir}" && ! -d ${repo_dir}/.bzr ]]; then
 			einfo "creating shared bzr repository: ${repo_dir}"
@@ -252,14 +250,23 @@
 		bzr_update "${EBZR_REPO_URI}" "${branch_dir}"
 	fi
 
+	# Restore sandbox environment
+	SANDBOX_WRITE=${save_sandbox_write}
+
 	cd "${branch_dir}" || die "${EBZR}: can't chdir to ${branch_dir}"
 
 	# Save revision number in environment. #311101
 	export EBZR_REVNO=$(${EBZR_REVNO_CMD})
 
-	einfo "exporting ..."
-	${EBZR_EXPORT_CMD} ${EBZR_REVISION:+-r ${EBZR_REVISION}} \
-		"${WORKDIR}/${P}" . || die "${EBZR}: export failed"
+	if [[ -n ${EBZR_WORKDIR_CHECKOUT} ]]; then
+		einfo "checking out ..."
+		${EBZR_CHECKOUT_CMD} ${EBZR_REVISION:+-r ${EBZR_REVISION}} \
+			. "${WORKDIR}/${P}" || die "${EBZR}: checkout failed"
+	else
+		einfo "exporting ..."
+		${EBZR_EXPORT_CMD} ${EBZR_REVISION:+-r ${EBZR_REVISION}} \
+			"${WORKDIR}/${P}" . || die "${EBZR}: export failed"
+	fi
 	einfo "revision ${EBZR_REVISION:-${EBZR_REVNO}} is now in ${WORKDIR}/${P}"
 
 	popd > /dev/null



1.405                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.405&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.405&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.404&r2=1.405

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -r1.404 -r1.405
--- ChangeLog	18 Sep 2012 01:26:55 -0000	1.404
+++ ChangeLog	18 Sep 2012 06:41:45 -0000	1.405
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.404 2012/09/18 01:26:55 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.405 2012/09/18 06:41:45 ulm Exp $
+
+  18 Sep 2012; Ulrich Müller <ulm@gentoo.org> bzr.eclass:
+  Use lightweight checkout instead of export if EBZR_WORKDIR_CHECKOUT is set;
+  bug 434746. Remove old cleanup code.
 
   18 Sep 2012; Tim Harder <radhermit@gentoo.org> vim.eclass:
   Use has_version instead of built_with_use.





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

* [gentoo-commits] gentoo-x86 commit in eclass: bzr.eclass ChangeLog
@ 2013-07-11 18:38 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Mueller (ulm) @ 2013-07-11 18:38 UTC (permalink / raw
  To: gentoo-commits

ulm         13/07/11 18:38:59

  Modified:             bzr.eclass ChangeLog
  Log:
  New variable EBZR_UNPACK_DIR.

Revision  Changes    Path
1.20                 eclass/bzr.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bzr.eclass?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bzr.eclass?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bzr.eclass?r1=1.19&r2=1.20

Index: bzr.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/bzr.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bzr.eclass	18 Sep 2012 06:41:45 -0000	1.19
+++ bzr.eclass	11 Jul 2013 18:38:59 -0000	1.20
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/bzr.eclass,v 1.19 2012/09/18 06:41:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bzr.eclass,v 1.20 2013/07/11 18:38:59 ulm Exp $
 #
 # @ECLASS: bzr.eclass
 # @MAINTAINER:
@@ -41,6 +41,11 @@
 # The directory to store all fetched Bazaar live sources.
 : ${EBZR_STORE_DIR:=${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}/bzr-src}
 
+# @ECLASS-VARIABLE: EBZR_UNPACK_DIR
+# @DESCRIPTION:
+# The working directory where the sources are copied to.
+: ${EBZR_UNPACK_DIR:=${WORKDIR}/${P}}
+
 # @ECLASS-VARIABLE: EBZR_INIT_REPO_CMD
 # @DESCRIPTION:
 # The Bazaar command to initialise a shared repository.
@@ -261,13 +266,14 @@
 	if [[ -n ${EBZR_WORKDIR_CHECKOUT} ]]; then
 		einfo "checking out ..."
 		${EBZR_CHECKOUT_CMD} ${EBZR_REVISION:+-r ${EBZR_REVISION}} \
-			. "${WORKDIR}/${P}" || die "${EBZR}: checkout failed"
+			. "${EBZR_UNPACK_DIR}" || die "${EBZR}: checkout failed"
 	else
 		einfo "exporting ..."
 		${EBZR_EXPORT_CMD} ${EBZR_REVISION:+-r ${EBZR_REVISION}} \
-			"${WORKDIR}/${P}" . || die "${EBZR}: export failed"
+			"${EBZR_UNPACK_DIR}" . || die "${EBZR}: export failed"
 	fi
-	einfo "revision ${EBZR_REVISION:-${EBZR_REVNO}} is now in ${WORKDIR}/${P}"
+	einfo \
+		"revision ${EBZR_REVISION:-${EBZR_REVNO}} is now in ${EBZR_UNPACK_DIR}"
 
 	popd > /dev/null
 }



1.878                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.878&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.878&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.877&r2=1.878

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.877
retrieving revision 1.878
diff -u -r1.877 -r1.878
--- ChangeLog	11 Jul 2013 07:20:13 -0000	1.877
+++ ChangeLog	11 Jul 2013 18:38:59 -0000	1.878
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.877 2013/07/11 07:20:13 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.878 2013/07/11 18:38:59 ulm Exp $
+
+  11 Jul 2013; Ulrich Müller <ulm@gentoo.org> bzr.eclass:
+  New variable EBZR_UNPACK_DIR.
 
   11 Jul 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
   Add a safety check for using python_optimize() in pkg_*.





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

* [gentoo-commits] gentoo-x86 commit in eclass: bzr.eclass ChangeLog
@ 2014-11-13  7:15 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Mueller (ulm) @ 2014-11-13  7:15 UTC (permalink / raw
  To: gentoo-commits

ulm         14/11/13 07:15:54

  Modified:             bzr.eclass ChangeLog
  Log:
  Remove Emacs team from maintainers of bzr.eclass.

Revision  Changes    Path
1.21                 eclass/bzr.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bzr.eclass?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bzr.eclass?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bzr.eclass?r1=1.20&r2=1.21

Index: bzr.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/bzr.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bzr.eclass	11 Jul 2013 18:38:59 -0000	1.20
+++ bzr.eclass	13 Nov 2014 07:15:54 -0000	1.21
@@ -1,10 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/bzr.eclass,v 1.20 2013/07/11 18:38:59 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bzr.eclass,v 1.21 2014/11/13 07:15:54 ulm Exp $
 #
 # @ECLASS: bzr.eclass
 # @MAINTAINER:
-# Emacs team <emacs@gentoo.org>
 # Bazaar team <bazaar@gentoo.org>
 # @AUTHOR:
 # Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>



1.1419               eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1419&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1419&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1418&r2=1.1419

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1418
retrieving revision 1.1419
diff -u -r1.1418 -r1.1419
--- ChangeLog	13 Nov 2014 04:34:05 -0000	1.1418
+++ ChangeLog	13 Nov 2014 07:15:54 -0000	1.1419
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1418 2014/11/13 04:34:05 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1419 2014/11/13 07:15:54 ulm Exp $
+
+  13 Nov 2014; Ulrich Müller <ulm@gentoo.org> bzr.eclass:
+  Remove Emacs team from maintainers of bzr.eclass.
 
   13 Nov 2014; Michael Palimaka <kensington@gentoo.org> kde5.eclass:
   Sync with KDE overlay. Raise kde-frameworks/kf-env dependency and update





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

end of thread, other threads:[~2014-11-13  7:15 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-13  7:15 [gentoo-commits] gentoo-x86 commit in eclass: bzr.eclass ChangeLog Ulrich Mueller (ulm)
  -- strict thread matches above, loose matches on Subject: below --
2013-07-11 18:38 Ulrich Mueller (ulm)
2012-09-18  6:41 Ulrich Mueller (ulm)
2012-07-18 15:12 Ulrich Mueller (ulm)

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