From 81b553d5a909aa72fd83a85ef2851cf5d48f4e1f Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Tue, 1 Mar 2011 13:22:23 +0000 Subject: Add blocker against 23.3 release candidate. Package-Manager: portage-2.1.9.41/cvs/Linux x86_64 --- app-editors/emacs-vcs/Manifest | 8 ++++---- app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'app-editors') diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest index c28de6dc45d7..bccc27405227 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 10396 RMD160 0fba4752513459b122c8156584315fb5a6bcc323 SHA1 d8fcfbaeb748cf43e837a6cb8f036de69da3d65f SHA256 a955410b2084ebfd0d1edade52d732bdeaa8605dbd5b35907f3a2e2069d5814c +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 MISC metadata.xml 1801 RMD160 606c780a3e86f485699157f14a35ca0e5da1d3c2 SHA1 05839ee25c6f6389e8eb80d783df895d59600a90 SHA256 bdc233a1795f52900dbe4d0a39c0e56d4eb5ba1c4842b9c46bae47f7052d5d74 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk1sj4EACgkQOeoy/oIi7uyt9gCcCWdw0/vCNfmjFoSWY0ulKM1q -fn8AnRBzx+SfghaO+Btn4Dk+bZ6sGIHQ -=5Cyo +iEYEARECAAYFAk1s9KAACgkQOeoy/oIi7uy48ACeJ5fCq3nhTdE205a0Jn0P3dDh +hLAAn2DoRkbIkrug9oHQQvclyhGcXKlY +=Qjnh -----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 8cbb68557b8b..bcbde023a42c 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.1 2011/03/01 06:10:57 ulm Exp $ +# $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 $ EAPI=4 WANT_AUTOMAKE="none" @@ -72,6 +72,7 @@ DEPEND="${RDEPEND} gzip-el? ( app-arch/gzip )" RDEPEND="${RDEPEND} + !=app-editors/emacs-23.3* >=app-emacs/emacs-common-gentoo-1[X?]" EMACS_SUFFIX="emacs-${SLOT}-vcs" @@ -94,7 +95,7 @@ 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 -- cgit v1.2.3-65-gdbad