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

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

5 files changed, 66 insertions, 23 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/Manifest b/x11-terms/st/Manifest
index 06dd3ff72cfb..9efb98038bab 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -1,25 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST 0.1.1.tar.gz 17215 RMD160 ea4b8499330247fc8901efd35632457630ad82f7 SHA1 d3c6a3d4dd9c7c626e96729b7b8c435213344d22 SHA256 931c675d978f221acbd285f15e43c1d775cf9978adf41f9a103ae75888b51165
-EBUILD st-0.1.1.ebuild 1115 RMD160 8a212952c57c03feffe105d8b35af94bf2426dec SHA1 8503fcbf282bf154482033b662dc7ec4c9c6f643 SHA256 50f61f79981750e0d4256df6081e304b5d5480ffec9ea315a98a526b4e173c6b
-EBUILD st-9999.ebuild 1159 RMD160 bf1ef3f6689ebfab3231d99ff09ae8ee2e3e7422 SHA1 d4c5045ec748b5b192f6316d3837c7ff11aabae6 SHA256 b7604dea38788a47f65abebf83e7e2cc4eaede22f88b9d5904f842737b6a89b8
-MISC ChangeLog 636 RMD160 de4110c05ed2a45cd56dc8b8c0aa7bfa17e68af0 SHA1 bc658de19503a266ef4044e49f28ddc5e3f1e547 SHA256 4ce6bed13f840cb0fe45eea8cab8db1047625c460f1668d131a774fa9922ef9d
+DIST st-0.1.1.tar.gz 17210 RMD160 f178adc34bdc75819be65b93eddb32393f2f271b SHA1 69217f4949bd7005861770c4b988e961e2838fa9 SHA256 55898f80b3fbe1300ccbb20bcf94d4be63192458bc227429ae2afe7ef877f2bb
+DIST st-0.2.1.tar.gz 19804 RMD160 558eda997ed3d4bdfd0bfd9452c15ab7afeee9d6 SHA1 0f93a7f049cd7a0a72b2c877455a68aa3ec869d6 SHA256 4bf5817483d3274fae9a205e692b308a5fd0cfcb55ed9f3761d2c564b4f7d897
+EBUILD st-0.1.1.ebuild 1127 RMD160 2d0ecf9deb2859e3ab8645db7c6fe68eaf91b757 SHA1 db4c795c253adaecd2eacdd8604185a1481f035f SHA256 a55a0bbe22fe1c85ee5a4cca09a5d45fb4e207784a2afc7f55b8c2f42113c23d
+EBUILD st-0.2.1.ebuild 1122 RMD160 254ca37c7ba9b53e1915f4640cd370282a52a3ca SHA1 8788cdb37da4aa1f94a6e481367c07952003118f SHA256 6eb5a53eb198cfbfa043c5c4593c5ea8985a3fb000661dd5a2ff0cc1901445f6
+EBUILD st-9999.ebuild 1099 RMD160 bb4706344f09257f3105ac4ad1903e2fbdc93197 SHA1 1e10c65373b16596cda4f35b982b05fc11858d3c SHA256 50b5f387963c1d3e9ab313dbebc4976b8a8fc770f56511ccce66893e00021380
+MISC ChangeLog 869 RMD160 fd54ab47b972d7e36bfe7a1117adc015771039a7 SHA1 a19963ae3f09d9c5c93de07ff2d4785300a7e3c5 SHA256 48c15f57c8e0e7ae575c5b696bf7a5299efca2b796018bb2f35d4e2f912ce262
 MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPA+UkAAoJELEHsLL7fEFWRykP/0+e+XX75sG2/hFqX1OHHAdj
-kmld0L8IZ6fs54nvVSRCB+1FHlUqzWrS+ZgRdXcRhpNO7kPIYT0RqS1BtmMiTKut
-l7ClWpR1WMj3slP1M6b0grlZxeHa7NHO44+0rXecUl5/vfeeA9ZD8gvoJa9zB9Hv
-H7NWg1NbvVUSTAl3c5xGxqTXehQWaY9oR2wjjP8kLJRp8RwCioCZ4LxNAjXS6kLE
-c00sZCU2tq8SS3mp0Y83jv7cYIN/g32R1FO/526X5I3UIPjTo8OpvRjaNJtpj40D
-yP+8k5ArWaOTfcIr8+CzkXlp16d1w1pCfBOkm2RnwyuYMzJ97z3VUvKWYpo91yGS
-LmZLnB6ymLImAiIX5vhOaBHTX//mFRxhDhlBjg2XyfbfGVqVlicOcO0GbfVn5TOq
-AEWodXv+1Hrm5YJxLf3ild8Q5FhqqCH+bNF9oV1MCcrTUWjQ6F/Vtt1raz6eAt30
-A7FUYL/z0hHq5hEegIoQHjH5G+W99XTTj//ivao3ZYuM5aU99XAmcG3CcGSa3aS0
-9da1UnGGRiWH1Hy7jM8sCwaiITt3CmpYdV+2mGuuloXf1hID6KYI8ZY9o3FSM8Qo
-4r1JfK+rCAull+tDUQWyGO/QZe0wSLz+rk+Q9DZRrmxkZxw2maWmTnqdIaX6WKzU
-miHiIIX/7PtTDqMclBrA
-=8dOH
+iEYEARECAAYFAk9XpFMACgkQVWmRsqeSphPZVACdHibw9W2qLoSvkbukdRENu1Mw
+V2AAmwZLtJZ5XqJxAFFXiirjNLANjTak
+=rWzV
 -----END PGP SIGNATURE-----
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"