summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-terms/st/ChangeLog8
-rw-r--r--x11-terms/st/Manifest14
-rw-r--r--x11-terms/st/metadata.xml1
-rw-r--r--x11-terms/st/st-0.3.ebuild18
-rw-r--r--x11-terms/st/st-9999.ebuild32
5 files changed, 39 insertions, 34 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/Manifest b/x11-terms/st/Manifest
index 51028467fdf1..70934c2ea982 100644
--- a/x11-terms/st/Manifest
+++ b/x11-terms/st/Manifest
@@ -6,14 +6,14 @@ DIST st-0.2.1.tar.gz 19804 SHA256 4bf5817483d3274fae9a205e692b308a5fd0cfcb55ed9f
DIST st-0.3.tar.gz 25637 SHA256 94a5be6c6879ec6bcb441c476cc0df8c4ffc38995abeafe1b603eb2b65a3d78b SHA512 8edb434e2f845894d90bfca15dbfc0feb787e65934e931b28c54a309b98f0b03116826fcf1c6e34068ac3c42ba18237cfbfef4a73480f273ec9e39bd68029990 WHIRLPOOL 850605a2bf9a638751bcaf264a97c40e9ba336197983292849667a8277713ea8f4dfb6316b6bc236923fe4ca088191b9b498fe981a667adf1c67292b7f356d20
EBUILD st-0.1.1.ebuild 1120 SHA256 be3a1674c29dc00f3df12ee72fc58962b3e3bd583db2e03033b84512096e622c SHA512 61830c9ba8fb6b32b389e3d512462351379d5b95419f03ff3dcf0ea767a83908af59334d072bce018f4f8f434914363e097fb4b6f66d39b56f50f02e23802544 WHIRLPOOL cd4cbce111800ebb32f94d90928cb1da8e8617f9cf93cff9ee25b69f6277109884005033ff1d63465f9d591b9a25c8d31d7c28586bc949836c941825318e2290
EBUILD st-0.2.1.ebuild 1115 SHA256 6102f4bc9d5455642a29c812c3b81fac6c16b50696223acb88a977e9bb9a9fa1 SHA512 cf80b1a4bc23197c118f06414b835ad1b449fe977d707373b3571de6fe3a08e463250ea197fc2e35622301cddee6f165236ac02743b2481e60ca670eb279c0a9 WHIRLPOOL 4b40c686d49257a2346f1a03dc02040cb1dc6d9040e927222852e056a6a23dec3e254f154057c6eb75e9dd537ad983e4d3bd04795d9b1d5d241aa53346c25524
-EBUILD st-0.3.ebuild 1265 SHA256 d1c575fc967c61961be2a4f1b345e831f62013a629950a6b574de908a327bed1 SHA512 5bbdac3ae0b76b31e5feafa1299f5c0bb10e7984d677567d94ad6ab69f7b58289681cd01d3549ff7551d7b8a72dba55d67f3dac72140264a145f285a50369987 WHIRLPOOL 7df3e55f7e237201bee537aecd82d3b26aab2f0f36436da9bf3514f3f86c70459c69ada444bccc6ee2923a1ddd9a23aa0bd57a5b4c64beaa10467d367a99cb35
-EBUILD st-9999.ebuild 1089 SHA256 b244ba7d5a69e4af5f90ee2063a63292d19f40f09722a26908d7853dbe6c2d60 SHA512 4634346630263aa4235b6c679cfafda60848291babb33a6440bb1f3fe4e7558e2a5fdc7f88b62b78b985cffec78c4944864cfb876da9d46586b58a2a9f2d345c WHIRLPOOL 197e2a0c0bd9429fe156eb9f91d3a74ac5124380a7ba4880435ba7b81c38e8159bcff7b3ef38e03bc4eb5f6fd6847b8fb3dd19a983e68a308c3985049a6cd0ec
-MISC ChangeLog 1453 SHA256 111f13cb381042963136b1c454f3c8d3931c03c6e1564ed1095099e1a6b8a817 SHA512 511739dad0a9bd425f9cc9a5f934ccf8e76175a7b5613f5dd3c4749ec18f4a7c7a9f7158043213edca2fd0c3254b51801fb420da7d8a813c4a33ccae4572f765 WHIRLPOOL 6a4d312bc40429618669ba84f8dd3decb7ccfe0a8778db2b82166ab766272c29b226cab79abcb1367cabfd655e3afe4327f60cff43c302eff08a36dd9985f56b
-MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868
+EBUILD st-0.3.ebuild 1270 SHA256 c515ec70eaa3e2a3181fe10e9bd9f7cb8936629973ffd400077898ead8a127e6 SHA512 2df680b944b17eb495117da3a19599c43142da7eb8bd8448414fd2f9b5c2bb273ac34da73b0fc82c120b97eeac499cbd284c98a42cab473646a807c0f0538bf2 WHIRLPOOL 5af0b645f82ea14a5f634d884c8190e33c71f32c45bf01666d5593cd4ff2425269b76e4925a933ed1242b86c4f0937f86fa5aa04c9400d45d60a70abcf314ff4
+EBUILD st-9999.ebuild 1205 SHA256 cdc80b36823de30f82cceda643827dfe52e55254fe439b28e55bc0d966088210 SHA512 1448c51791a50d621196aef313ffd798d6199763ac7dcc22c150301d2fc439258177019d4ac3a22cbd94f93820277972893030d4b09429b8c49610c4c9dcdd5b WHIRLPOOL 7c1768d2c051d47ddaeb99048988292d206b977e35a8ba5510e5b5d28a4053705ab49b5e29ea30d37e54d366210e6f9b68e3103b38cad2296be506a6d7fa5754
+MISC ChangeLog 1592 SHA256 7a17ae06a9ee9602a6e4643eea2b56ac0de3ccf04ae5e42d7afb0ec85b818763 SHA512 89a3638d7be031da59555bfdfba4fb17e154d2a93d54b3517942996dbc03338baf5493469c3162fdf498a9eb49a455912b250eac5e89f13880fe287e12edda39 WHIRLPOOL 4f587317fe295fcb913097dfb9d21c7512322a0f82145c93164137227b34b1c1015f09513c4e9a8531422b3e3144027b697a39c761b75387718a00ff03bbe45e
+MISC metadata.xml 223 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d SHA512 c9f6a48b2aa05afdf73b8bd824c65480d76e54b659ca39928398c66f764d34faf186255d8aea034737424a962cf35151b610d078a01f8193b027c63e1e3c51b5 WHIRLPOOL 1ce20c98a7e177b8f510ef41f3935b0db5e04b2ecf465a683b2f2515f6a3043c33e6e9efc87f5aaaf59b2ed9be376d9d16bc8beff66b11aaa50ea899bfdc1f62
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iF4EAREIAAYFAlDPlRQACgkQknrdDGLu8JBm6wEAlesLIUuMBf89vKx8jcvnFsWk
-nJm5FyHecysKnee6uBQBAJni7IlI06cGt6ESMmwZoBjXcMqiI6jqYtGvM1N+sxKI
-=Lc1c
+iF4EAREIAAYFAlEnmeYACgkQknrdDGLu8JBCSwD/UPSKokcj+vWAu6n5fULy6Ns4
+6Z9R4JiGBuJuHMy4DVMA/3+2howrfkls2FiFxjebQ1A4CkofB7vcdy4WkygZfZY8
+=ZVuT
-----END PGP SIGNATURE-----
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
+}