Do not hard-code version in SRC_URI. Use SRC_URI arrows. Do not set SRC_URI in 9999 ebuild. Version bump.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

4 files changed, 56 insertions, 5 deletions

diff --git a/x11-terms/st/ChangeLog b/x11-terms/st/ChangeLog
index 66f5dbed7919..7c61251c9e92 100644
--- a/x11-terms/st/ChangeLog
+++ b/x11-terms/st/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-terms/st
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/ChangeLog,v 1.3 2012/01/04 05:35:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/ChangeLog,v 1.4 2012/03/07 18:09:17 jer Exp $
+
+*st-0.2.1 (07 Mar 2012)
+
+  07 Mar 2012; Jeroen Roovers <jer@gentoo.org> st-0.1.1.ebuild,
+  +st-0.2.1.ebuild, st-9999.ebuild:
+  Do not hard-code version in SRC_URI. Use SRC_URI arrows. Do not set SRC_URI
+  in 9999 ebuild. Version bump.
 
   04 Jan 2012; Mike Frysinger <vapier@gentoo.org> st-0.1.1.ebuild,
   st-9999.ebuild:
diff --git a/x11-terms/st/st-0.1.1.ebuild b/x11-terms/st/st-0.1.1.ebuild
index 0490488cac57..e427c0836ddf 100644
--- a/x11-terms/st/st-0.1.1.ebuild
+++ b/x11-terms/st/st-0.1.1.ebuild
@@ -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/x11-terms/st/st-0.1.1.ebuild,v 1.3 2012/01/04 05:35:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-0.1.1.ebuild,v 1.4 2012/03/07 18:09:17 jer Exp $
 
 EAPI=3
 
@@ -8,7 +8,7 @@ inherit savedconfig toolchain-funcs
 
 DESCRIPTION="simple terminal implementation for X"
 HOMEPAGE="http://st.suckless.org/"
-SRC_URI="http://hg.suckless.org/st/archive/0.1.1.tar.gz"
+SRC_URI="http://hg.suckless.org/st/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/x11-terms/st/st-0.2.1.ebuild b/x11-terms/st/st-0.2.1.ebuild
new file mode 100644
index 000000000000..b54354ee73e2
--- /dev/null
+++ b/x11-terms/st/st-0.2.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-0.2.1.ebuild,v 1.1 2012/03/07 18:09:17 jer Exp $
+
+EAPI=4
+
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="simple terminal implementation for X"
+HOMEPAGE="http://st.suckless.org/"
+SRC_URI="http://hg.suckless.org/st/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+	sys-libs/ncurses"
+
+src_prepare() {
+	sed -e '/^CFLAGS/s:[[:space:]]-Wall[[:space:]]: :' \
+		-e '/^CFLAGS/s:[[:space:]]-O[^[:space:]]*[[:space:]]: :' \
+		-e '/^LDFLAGS/{s:[[:space:]]-s[[:space:]]: :}' \
+		-i config.mk || die
+	tc-export CC
+
+	restore_config config.h
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install || die
+	tic -s -o "${ED}"/usr/share/terminfo st.info || die
+	dodoc README TODO
+
+	save_config config.h
+}
+
+pkg_postinst() {
+	elog "Please ensure a usable font is installed, like"
+	elog "    media-fonts/corefonts"
+	elog "    media-fonts/dejavu"
+	elog "    media-fonts/urw-fonts"
+}
diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild
index 992389484aba..fe5dae78bc45 100644
--- a/x11-terms/st/st-9999.ebuild
+++ b/x11-terms/st/st-9999.ebuild
@@ -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/x11-terms/st/st-9999.ebuild,v 1.3 2012/01/04 05:35:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-9999.ebuild,v 1.4 2012/03/07 18:09:17 jer Exp $
 
 EAPI=3
 
@@ -8,7 +8,6 @@ inherit mercurial savedconfig toolchain-funcs
 
 DESCRIPTION="simple terminal implementation for X"
 HOMEPAGE="http://st.suckless.org/"
-SRC_URI="http://hg.suckless.org/st/archive/0.1.1.tar.gz"
 EHG_REPO_URI="http://hg.suckless.org/st"
 
 LICENSE="BSD"