Add IUSE savedconfig, update live ebuild.

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

4 files changed, 32 insertions, 27 deletions

diff --git a/x11-terms/st/ChangeLog b/x11-terms/st/ChangeLog
index ac1131d44029..cc53a6c6d2a9 100644
--- a/x11-terms/st/ChangeLog
+++ b/x11-terms/st/ChangeLog
@@ -1,6 +1,10 @@
 # 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.9 2012/12/17 21:56:50 xmw Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/ChangeLog,v 1.10 2013/02/22 16:16:39 xmw Exp $
+
+  22 Feb 2013; Michael Weber <xmw@gentoo.org> st-0.3.ebuild, st-9999.ebuild,
+  metadata.xml:
+  Add IUSE savedconfig, update live ebuild.
 
   17 Dec 2012; Michael Weber <xmw@gentoo.org> st-9999.ebuild:
   Update live ebuild from mercurial to git (thanks Andreas Wiese, bug 447564)
diff --git a/x11-terms/st/metadata.xml b/x11-terms/st/metadata.xml
index 59acc2cc580e..5b80fb94c393 100644
--- a/x11-terms/st/metadata.xml
+++ b/x11-terms/st/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-
diff --git a/x11-terms/st/st-0.3.ebuild b/x11-terms/st/st-0.3.ebuild
index 8e1d80d576d9..61881a1a32b6 100644
--- a/x11-terms/st/st-0.3.ebuild
+++ b/x11-terms/st/st-0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-0.3.ebuild,v 1.3 2012/11/07 17:48:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-0.3.ebuild,v 1.4 2013/02/22 16:16:39 xmw Exp $
 
 EAPI=4
 inherit savedconfig toolchain-funcs
@@ -12,20 +12,16 @@ SRC_URI="http://hg.suckless.org/st/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="savedconfig"
 
-RDEPEND="
-	media-libs/fontconfig
+RDEPEND="media-libs/fontconfig
 	x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/libXft
-"
-DEPEND="
-	${RDEPEND}
+	x11-libs/libXft"
+DEPEND="${RDEPEND}
 	sys-libs/ncurses
 	x11-proto/xextproto
-	x11-proto/xproto
-"
+	x11-proto/xproto"
 
 src_prepare() {
 	sed -e '/^CFLAGS/s:[[:space:]]-Wall[[:space:]]: :' \
diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild
index bab99ae387c9..8df10f32c2f4 100644
--- a/x11-terms/st/st-9999.ebuild
+++ b/x11-terms/st/st-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.6 2012/12/17 21:56:50 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-9999.ebuild,v 1.7 2013/02/22 16:16:39 xmw Exp $
 
-EAPI=3
+EAPI=5
 
 inherit git-2 savedconfig toolchain-funcs
 
@@ -13,19 +13,16 @@ EGIT_REPO_URI="git://git.suckless.org/st"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="savedconfig"
 
-RDEPEND="x11-libs/libX11"
+RDEPEND="
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft"
 DEPEND="${RDEPEND}
 	sys-libs/ncurses"
 
-pkg_setup() {
-	elog "Please ensure an usable font is installed, like"
-	elog "    media-fonts/corefonts"
-	elog "    media-fonts/dejavu"
-	elog "    media-fonts/urw-fonts"
-}
-
 src_prepare() {
 	sed -e '/^CFLAGS/s:[[:space:]]-Wall[[:space:]]: :' \
 		-e '/^CFLAGS/s:[[:space:]]-O[^[:space:]]*[[:space:]]: :' \
@@ -39,7 +36,16 @@ src_prepare() {
 src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install || die
 	tic -s -o "${ED}"/usr/share/terminfo st.info || die
-	dodoc TODO || die
+	dodoc TODO
 
 	save_config config.h
 }
+
+pkg_postinst() {
+	if ! [[ "${REPLACING_VERSIONS}" ]]; then
+		elog "Please ensure a usable font is installed, like"
+		elog "    media-fonts/corefonts"
+		elog "    media-fonts/dejavu"
+		elog "    media-fonts/urw-fonts"
+	fi
+}