From 2c020f29aa724ed96a3f202e61036490b645fa0c Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Mon, 6 Jan 2014 21:17:53 +0000 Subject: Add desktop entry. "Migrate" to git-r3.eclass. (Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key A792A613) --- x11-terms/st/ChangeLog | 10 ++++++-- x11-terms/st/st-0.4.1-r1.ebuild | 57 +++++++++++++++++++++++++++++++++++++++++ x11-terms/st/st-0.4.ebuild | 55 --------------------------------------- x11-terms/st/st-9999.ebuild | 9 ++++--- 4 files changed, 70 insertions(+), 61 deletions(-) create mode 100644 x11-terms/st/st-0.4.1-r1.ebuild delete mode 100644 x11-terms/st/st-0.4.ebuild (limited to 'x11-terms/st') diff --git a/x11-terms/st/ChangeLog b/x11-terms/st/ChangeLog index 0d86c0200ddb..1c324fdc955c 100644 --- a/x11-terms/st/ChangeLog +++ b/x11-terms/st/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-terms/st -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/ChangeLog,v 1.16 2013/06/17 06:08:43 xmw Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/ChangeLog,v 1.17 2014/01/06 21:17:53 jer Exp $ + +*st-0.4.1-r1 (06 Jan 2014) + + 06 Jan 2014; Jeroen Roovers -st-0.4.ebuild, + +st-0.4.1-r1.ebuild, st-9999.ebuild: + Add desktop entry. "Migrate" to git-r3.eclass. 17 Jun 2013; Michael Weber st-0.4.1.ebuild, st-0.4.ebuild, st-9999.ebuild: diff --git a/x11-terms/st/st-0.4.1-r1.ebuild b/x11-terms/st/st-0.4.1-r1.ebuild new file mode 100644 index 000000000000..50a94038f8be --- /dev/null +++ b/x11-terms/st/st-0.4.1-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-0.4.1-r1.ebuild,v 1.1 2014/01/06 21:17:53 jer Exp $ + +EAPI=5 + +inherit eutils multilib savedconfig toolchain-funcs + +DESCRIPTION="simple terminal implementation for X" +HOMEPAGE="http://st.suckless.org/" +SRC_URI="http://dl.suckless.org/st/${P}.tar.gz" + +LICENSE="MIT-with-advertising" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="savedconfig" + +RDEPEND="media-libs/fontconfig + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXft" +DEPEND="${RDEPEND} + sys-libs/ncurses + virtual/pkgconfig + x11-proto/xextproto + x11-proto/xproto" + +src_prepare() { + sed -e '/^CFLAGS/s:[[:space:]]-O[^[:space:]]*[[:space:]]: :' \ + -e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \ + -e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \ + -i config.mk || die + sed -e '/@echo/!s:@::' \ + -i Makefile || die + tc-export CC + + restore_config config.h +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install + tic -s -o "${ED}"/usr/share/terminfo st.info || die + dodoc TODO + + make_desktop_entry ${PN} simpleterm utilities-terminal 'System;TerminalEmulator;' '' + + 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 +} diff --git a/x11-terms/st/st-0.4.ebuild b/x11-terms/st/st-0.4.ebuild deleted file mode 100644 index 934b9521afa7..000000000000 --- a/x11-terms/st/st-0.4.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# 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.4.ebuild,v 1.4 2013/06/17 06:08:43 xmw Exp $ - -EAPI=5 - -inherit multilib savedconfig toolchain-funcs - -DESCRIPTION="simple terminal implementation for X" -HOMEPAGE="http://st.suckless.org/" -SRC_URI="http://dl.suckless.org/st/${P}.tar.gz" - -LICENSE="MIT-with-advertising" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="savedconfig" - -RDEPEND="media-libs/fontconfig - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft" -DEPEND="${RDEPEND} - sys-libs/ncurses - virtual/pkgconfig - x11-proto/xextproto - x11-proto/xproto" - -src_prepare() { - sed -e '/^CFLAGS/s:[[:space:]]-O[^[:space:]]*[[:space:]]: :' \ - -e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \ - -e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \ - -i config.mk || die - sed -e '/@echo/!s:@::' \ - -i Makefile || die - tc-export CC - - restore_config config.h -} - -src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install - tic -s -o "${ED}"/usr/share/terminfo st.info || 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 -} diff --git a/x11-terms/st/st-9999.ebuild b/x11-terms/st/st-9999.ebuild index ce330d603f19..2a38a1ecdacb 100644 --- a/x11-terms/st/st-9999.ebuild +++ b/x11-terms/st/st-9999.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 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.11 2013/06/17 06:08:43 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/st/st-9999.ebuild,v 1.12 2014/01/06 21:17:53 jer Exp $ EAPI=5 - -inherit git-2 multilib savedconfig toolchain-funcs +inherit eutils git-r3 multilib savedconfig toolchain-funcs DESCRIPTION="simple terminal implementation for X" HOMEPAGE="http://st.suckless.org/" @@ -44,6 +43,8 @@ src_install() { tic -s -o "${ED}"/usr/share/terminfo st.info || die dodoc TODO + make_desktop_entry ${PN} simpleterm utilities-terminal 'System;TerminalEmulator;' '' + save_config config.h } -- cgit v1.2.3-65-gdbad