using new-style virtual dependency

Package-Manager: portage-2.1.2.9

5 files changed, 56 insertions, 34 deletions

diff --git a/app-emacs/csharp-mode/ChangeLog b/app-emacs/csharp-mode/ChangeLog
index 28acc1b9fce4..d005279da2c3 100644
--- a/app-emacs/csharp-mode/ChangeLog
+++ b/app-emacs/csharp-mode/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/csharp-mode
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/csharp-mode/ChangeLog,v 1.2 2007/04/26 16:06:32 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/csharp-mode/ChangeLog,v 1.3 2007/07/02 06:34:42 opfer Exp $
+
+*csharp-mode-0.6.0-r1 (02 Jul 2007)
+
+  02 Jul 2007; Christian Faulhammer <opfer@gentoo.org>
+  -csharp-mode-0.6.0.ebuild, +csharp-mode-0.6.0-r1.ebuild:
+  using new-style virtual dependency
 
 *csharp-mode-0.6.0 (26 Apr 2007)
 
diff --git a/app-emacs/csharp-mode/Manifest b/app-emacs/csharp-mode/Manifest
index 025092be798a..537a1f3ac06d 100644
--- a/app-emacs/csharp-mode/Manifest
+++ b/app-emacs/csharp-mode/Manifest
@@ -11,14 +11,14 @@ EBUILD csharp-mode-0.5.0.ebuild 577 RMD160 9a15a1accfa0306cd7e3bf064a59b6302caad
 MD5 f5c3599ace3b61d45345d0bdf6673a60 csharp-mode-0.5.0.ebuild 577
 RMD160 9a15a1accfa0306cd7e3bf064a59b6302caad1e2 csharp-mode-0.5.0.ebuild 577
 SHA256 05d2a614a02b71f413835729d9bd580303c549ac34061080ec6a07d2d566968d csharp-mode-0.5.0.ebuild 577
-EBUILD csharp-mode-0.6.0.ebuild 577 RMD160 a9cc4505b6069e89d556191bd0f61478aab8932f SHA1 6d6580e0094412c15a21175edb86d5509badd075 SHA256 7f0b87376648b514b9a491a009a6a4941bb8e76de23c6d665df4292047f8d943
-MD5 289b177c62e9ee9af801c320ad4049f3 csharp-mode-0.6.0.ebuild 577
-RMD160 a9cc4505b6069e89d556191bd0f61478aab8932f csharp-mode-0.6.0.ebuild 577
-SHA256 7f0b87376648b514b9a491a009a6a4941bb8e76de23c6d665df4292047f8d943 csharp-mode-0.6.0.ebuild 577
-MISC ChangeLog 653 RMD160 9168fcd0cc171a4ad823ac9e4f4c039a884de907 SHA1 ddee3af76d2766356c48b3c310bda90252781a31 SHA256 f1a545766ce1f02111526902d3436b902394135ec9ed603c2c1e9ec663d85997
-MD5 879d2c640d56bfc18df68e62b5d9c1e7 ChangeLog 653
-RMD160 9168fcd0cc171a4ad823ac9e4f4c039a884de907 ChangeLog 653
-SHA256 f1a545766ce1f02111526902d3436b902394135ec9ed603c2c1e9ec663d85997 ChangeLog 653
+EBUILD csharp-mode-0.6.0-r1.ebuild 1134 RMD160 3ccbfb4701679735827d9cd4c6596ede03993902 SHA1 7bb44a5c492066eebf30f98be2f49d297b7b4b8f SHA256 2ffff54c1a074f822df827a5594c79c0941c11d33018e4160292b57ca5ee9f86
+MD5 01a88b7afba9716ab1e279dc13378c21 csharp-mode-0.6.0-r1.ebuild 1134
+RMD160 3ccbfb4701679735827d9cd4c6596ede03993902 csharp-mode-0.6.0-r1.ebuild 1134
+SHA256 2ffff54c1a074f822df827a5594c79c0941c11d33018e4160292b57ca5ee9f86 csharp-mode-0.6.0-r1.ebuild 1134
+MISC ChangeLog 844 RMD160 f3633e207eaa3d96ad5f32f6830641311061ef8f SHA1 19c979f88afb71db8f68cd8c120d58a138ab7af7 SHA256 21aeead7570c93e620d70c9cdaf03eac34bc332e2e5ca51359fa8e5d39f185ff
+MD5 ac3cf8498357cb58fc7692ff52ce7ee3 ChangeLog 844
+RMD160 f3633e207eaa3d96ad5f32f6830641311061ef8f ChangeLog 844
+SHA256 21aeead7570c93e620d70c9cdaf03eac34bc332e2e5ca51359fa8e5d39f185ff ChangeLog 844
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -26,13 +26,13 @@ SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata
 MD5 dd609fc35f6a53e310774347129cb617 files/digest-csharp-mode-0.5.0 250
 RMD160 99992edd4e36e948c2dc9ab96eb875a13770c43d files/digest-csharp-mode-0.5.0 250
 SHA256 47850d1ad1b5b3833e0a9b2305e9d81bb0d677e0fccb3b4308f3f45568a20301 files/digest-csharp-mode-0.5.0 250
-MD5 eac7803df47f1c8bad146a9390ff02e8 files/digest-csharp-mode-0.6.0 250
-RMD160 ecef6a5c0fcdd8283d62abc122478ec0cdfd8fae files/digest-csharp-mode-0.6.0 250
-SHA256 bda2626491ba65243f6d2f021b0020718187bc389ea739e03785f7143e8c58f3 files/digest-csharp-mode-0.6.0 250
+MD5 eac7803df47f1c8bad146a9390ff02e8 files/digest-csharp-mode-0.6.0-r1 250
+RMD160 ecef6a5c0fcdd8283d62abc122478ec0cdfd8fae files/digest-csharp-mode-0.6.0-r1 250
+SHA256 bda2626491ba65243f6d2f021b0020718187bc389ea739e03785f7143e8c58f3 files/digest-csharp-mode-0.6.0-r1 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGMM6JOeoy/oIi7uwRAgvlAKCc0bSBLYkGwluwPMed84FznWbr7QCggCd3
-ez7V++g5C7nwqP9/hKiPHfc=
-=hSt6
+iD8DBQFGiJyJNQqtfCuFneMRAnsMAKCdEsytJ3Iw9XVYQWJAGlt397mMBQCeISYI
+zrST8GsigkAVMflHlaoDzng=
+=ASRm
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/csharp-mode/csharp-mode-0.6.0-r1.ebuild b/app-emacs/csharp-mode/csharp-mode-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..3634503fbb25
--- /dev/null
+++ b/app-emacs/csharp-mode/csharp-mode-0.6.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/csharp-mode/csharp-mode-0.6.0-r1.ebuild,v 1.1 2007/07/02 06:34:42 opfer Exp $
+
+inherit elisp versionator
+
+DESCRIPTION="A derived Emacs mode implementing most of the C# rules"
+HOMEPAGE="http://mfgames.com/linux/csharp-mode"
+SRC_URI="http://mfgames.com/linux/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+NEED_CCMODE=5.30
+
+DEPEND="|| ( >=app-emacs/cc-mode-${NEED_CCMODE} >=virtual/emacs-22 )"
+RDEPEND="${DEPEND}"
+
+SIMPLE_ELISP=t
+SITEFILE=80${PN}-gentoo.el
+
+pkg_setup () {
+	local HAVE_CCMODE
+	HAVE_CCMODE=$(emacs -batch -q \
+		--eval "(and (require 'cc-mode nil t) (princ c-version))")
+	if [ -z "${HAVE_CCMODE}" ] \
+		|| ! version_is_at_least "${NEED_CCMODE}" "${HAVE_CCMODE}"; then
+		eerror "This package needs at least cc-mode version ${NEED_CCMODE}."
+		eerror "You should either install package app-emacs/cc-mode,"
+		eerror "or use \"eselect emacs\" to select an Emacs version >= 22."
+		die "cc-mode version ${HAVE_CCMODE} is too low."
+	fi
+}
diff --git a/app-emacs/csharp-mode/csharp-mode-0.6.0.ebuild b/app-emacs/csharp-mode/csharp-mode-0.6.0.ebuild
deleted file mode 100644
index 25d04f41fdea..000000000000
--- a/app-emacs/csharp-mode/csharp-mode-0.6.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/csharp-mode/csharp-mode-0.6.0.ebuild,v 1.1 2007/04/26 16:06:32 ulm Exp $
-
-inherit elisp
-
-DESCRIPTION="A derived Emacs mode implementing most of the C# rules"
-HOMEPAGE="http://mfgames.com/linux/csharp-mode"
-SRC_URI="http://mfgames.com/linux/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="|| ( app-editors/emacs-cvs app-emacs/cc-mode )"
-
-SIMPLE_ELISP=t
-SITEFILE=80${PN}-gentoo.el
diff --git a/app-emacs/csharp-mode/files/digest-csharp-mode-0.6.0 b/app-emacs/csharp-mode/files/digest-csharp-mode-0.6.0-r1
index dc958b922b4a..dc958b922b4a 100644
--- a/app-emacs/csharp-mode/files/digest-csharp-mode-0.6.0
+++ b/app-emacs/csharp-mode/files/digest-csharp-mode-0.6.0-r1