Version bump. Don't use versionator.eclass. Remove old.

(Portage version: 2.1.10.3/cvs/Linux x86_64)

4 files changed, 87 insertions, 74 deletions

diff --git a/dev-lang/c-intercal/ChangeLog b/dev-lang/c-intercal/ChangeLog
index b8bfca4deed0..64d063f86ec6 100644
--- a/dev-lang/c-intercal/ChangeLog
+++ b/dev-lang/c-intercal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/c-intercal
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/c-intercal/ChangeLog,v 1.4 2010/09/11 09:57:37 ulm Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/c-intercal/ChangeLog,v 1.5 2011/06/26 11:17:12 ulm Exp $
+
+*c-intercal-29.0 (26 Jun 2011)
+
+  26 Jun 2011; Ulrich Mueller <ulm@gentoo.org> -c-intercal-28.0-r1.ebuild,
+  c-intercal-28.65535.65534.0.ebuild, +c-intercal-29.0.ebuild:
+  Version bump. Don't use versionator.eclass. Remove old.
 
 *c-intercal-28.65535.65534.0 (11 Sep 2010)
 
diff --git a/dev-lang/c-intercal/c-intercal-28.0-r1.ebuild b/dev-lang/c-intercal/c-intercal-28.0-r1.ebuild
deleted file mode 100644
index 5176f960dbe5..000000000000
--- a/dev-lang/c-intercal/c-intercal-28.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/c-intercal/c-intercal-28.0-r1.ebuild,v 1.2 2009/03/18 11:14:38 ulm Exp $
-
-inherit elisp-common eutils multilib versionator
-
-# Yes, C-INTERCAL uses minor-major...
-MY_PV=$(get_version_component_range 2).$(get_version_component_range 1)
-
-DESCRIPTION="C-INTERCAL - INTERCAL to binary (via C) compiler"
-HOMEPAGE="http://intercal.freeshell.org"
-SRC_URI="http://intercal.freeshell.org/download/ick-${MY_PV/./-}.tgz"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs examples"
-
-DEPEND="emacs? ( virtual/emacs )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/ick-${MY_PV}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-fix-install-info.patch"
-	epatch "${FILESDIR}/${P}-fix-64bit.patch"
-	epatch "${FILESDIR}/${P}-parallel-make.patch"
-
-	# This was done for DOS compatiblity it seems. Go figure...
-	ln -s config.sh configure || die "ln -s failed"
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-
-	if use emacs; then
-		elisp-compile etc/intercal.el || die
-	fi
-}
-
-src_install() {
-	# Thinks the directories exist, won't as this is done to a DESTDIR...
-	dodir /usr/bin
-	dodir /usr/$(get_libdir)
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc BUGS.txt NEWS.txt README.txt doc/THEORY.txt
-
-	if use emacs; then
-		elisp-install ${PN} etc/intercal.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r pit || die "doins -r pit failed"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/c-intercal/c-intercal-28.65535.65534.0.ebuild b/dev-lang/c-intercal/c-intercal-28.65535.65534.0.ebuild
index ef9f1daf3115..f069e10eb576 100644
--- a/dev-lang/c-intercal/c-intercal-28.65535.65534.0.ebuild
+++ b/dev-lang/c-intercal/c-intercal-28.65535.65534.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/c-intercal/c-intercal-28.65535.65534.0.ebuild,v 1.1 2010/09/11 09:57:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/c-intercal/c-intercal-28.65535.65534.0.ebuild,v 1.2 2011/06/26 11:17:12 ulm Exp $
 
-inherit elisp-common eutils multilib versionator
+inherit elisp-common eutils multilib
 
 # C-INTERCAL uses minor-major ordering of version components and
 # negative version numbers. We map version components -1, -2, ...
diff --git a/dev-lang/c-intercal/c-intercal-29.0.ebuild b/dev-lang/c-intercal/c-intercal-29.0.ebuild
new file mode 100644
index 000000000000..37eb113be666
--- /dev/null
+++ b/dev-lang/c-intercal/c-intercal-29.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/c-intercal/c-intercal-29.0.ebuild,v 1.1 2011/06/26 11:17:12 ulm Exp $
+
+EAPI=4
+
+inherit elisp-common eutils multilib
+
+# C-INTERCAL uses minor-major ordering of version components and
+# negative version numbers. We map version components -1, -2, ...
+# to 65535, 65534, ..., and subtract one from the next component.
+# For example, upstream version 0.28 is mapped to Gentoo version 28.0
+# and 0.-2.0.29 is mapped to 28.65535.65534.0.
+get_intercal_version() {
+	local i=.${1:-${PV}} j k c=0
+	while [[ ${i} ]]; do
+		(( k = ${i##*.} + c ))
+		(( (c = (k >= 32768)) && (k -= 65536) ))
+		i=${i%.*}
+		j=${j}.${k}
+	done
+	echo ${j#.}
+}
+
+MY_PN="${PN#c-}"
+MY_PV="$(get_intercal_version)"
+DESCRIPTION="C-INTERCAL - INTERCAL to binary (via C) compiler"
+HOMEPAGE="http://c.intercal.org.uk"
+SRC_URI="http://overload.intercal.org.uk/c/${MY_PN}-${MY_PV}.pax.gz"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs examples"
+
+DEPEND="emacs? ( virtual/emacs )"
+RDEPEND="${DEPEND}"
+
+MY_PV2=${MY_PV%.${MY_PV##*.}}
+S="${WORKDIR}/${MY_PN}-${MY_PV2##*.}.${MY_PV##*.}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_unpack() {
+	tar xzf "${DISTDIR}/${A}" || die "tar failed"
+}
+
+src_compile() {
+	emake
+
+	if use emacs; then
+		elisp-compile etc/intercal.el || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc BUGS NEWS HISTORY README doc/THEORY.txt
+
+	if use emacs; then
+		elisp-install ${PN} etc/intercal.{el,elc} || die
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r pit
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}