summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2012-07-03 14:15:54 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2012-07-03 14:15:54 +0000
commita3528b4a6464a3265c18dc3e12dc9dbefa0662bb (patch)
tree50de6d77f8760a41f6d4cb918bdfe27b4fe82067 /x11-plugins
parentVersion bump for bug 423861. (diff)
downloadhistorical-a3528b4a6464a3265c18dc3e12dc9dbefa0662bb.tar.gz
historical-a3528b4a6464a3265c18dc3e12dc9dbefa0662bb.tar.bz2
historical-a3528b4a6464a3265c18dc3e12dc9dbefa0662bb.zip
Clean over-enthusiastic sed call, bug #424141. Ebuild cleanup and EAPI bump
Package-Manager: portage-2.2.0_alpha115/cvs/Linux x86_64
Diffstat (limited to 'x11-plugins')
-rw-r--r--x11-plugins/wmxres/ChangeLog7
-rw-r--r--x11-plugins/wmxres/Manifest14
-rw-r--r--x11-plugins/wmxres/wmxres-1.2.ebuild15
3 files changed, 24 insertions, 12 deletions
diff --git a/x11-plugins/wmxres/ChangeLog b/x11-plugins/wmxres/ChangeLog
index ada635fafd37..bb492fac200a 100644
--- a/x11-plugins/wmxres/ChangeLog
+++ b/x11-plugins/wmxres/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-plugins/wmxres
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxres/ChangeLog,v 1.9 2010/10/05 20:29:16 voyageur Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxres/ChangeLog,v 1.10 2012/07/03 14:15:54 voyageur Exp $
+
+ 03 Jul 2012; Bernard Cafarelli <voyageur@gentoo.org> wmxres-1.2.ebuild:
+ Clean over-enthusiastic sed call, bug #424141. Ebuild cleanup and EAPI bump
05 Oct 2010; Bernard Cafarelli <voyageur@gentoo.org> wmxres-1.2.ebuild:
Newer dga headers require libXxf86dga, thanks Agostino Sarubbo
diff --git a/x11-plugins/wmxres/Manifest b/x11-plugins/wmxres/Manifest
index 61dfad4d6c0f..fda30ebab7bc 100644
--- a/x11-plugins/wmxres/Manifest
+++ b/x11-plugins/wmxres/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX wmxres-debian-1.1-1.2.patch 1699 RMD160 1686239bd8c30a14d118c174492a6e4f8de7659a SHA1 fb87e463878a90469655ce5aab6e014c086215d5 SHA256 79f5a5204ade63f83553856a8bfe47258287e40f4a7a894c00a8c203e4eff7f1
DIST wmxres-1.1-0.tar.gz 9948 RMD160 7e492e5ac958d0467bdbdbba94eb4c008b97d55e SHA1 160589ea8acd74a2e0c7152a02c463d5d20a57fa SHA256 c6d1e0fbc1dce2aa9d35f1558b8d561c12677229a89b7f0a062679096f8a3b33
-EBUILD wmxres-1.2.ebuild 1028 RMD160 a5fa12d1117cd6878228a01a082e3bc1ceb8e969 SHA1 7fbc4df8e255fefe770c168d6fc3c3edea9d8ea6 SHA256 f47d7497dd1286ab742f6717f171d511eebcce5b8af26fd8a52068b0e916f10c
-MISC ChangeLog 1272 RMD160 e9ab5251b25bf8a52772b7b69d20858020ecde78 SHA1 065260ee5e4a3543c94b2c52d5eba7bda8375212 SHA256 dc2b469c32e72ce0ff9364b431d099687d84cdccf2c528e268cab16ec61c4f4d
+EBUILD wmxres-1.2.ebuild 1017 RMD160 bf353b58603c86aea0a878a7aff38105549ceb06 SHA1 712f2ff811fbb0b4f0d3e049cad3b4b8ff954194 SHA256 28adf18d74c638139fe456e823679df10a13e369a670fe71854596c80a698b4d
+MISC ChangeLog 1426 RMD160 9c5e825ca82408aeaae3829b21c2bc351d5b0669 SHA1 82a9b18be38e2ba10968faa5da7711a95693fd79 SHA256 88e813fac0cc0fb2df2acbea9434edd17489284404bf52ddcfb285e3f103949d
MISC metadata.xml 165 RMD160 a554e96dc33b1fb4b3518f27a21bf3f59dc21b1c SHA1 674655a4f0fc35c7b3b2e05aab1910c0ebafade1 SHA256 c2f8a0b30c83dba56f0c36a4ba1cb002621ae58dfc13fae94b9db6eb67fb9f1b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAk/y/qUACgkQFYEBGcdFJfJRqQEAibucu7fCyWs5INB6BWowDqFj
+YLZi6HaBnZA2ZpUzwa4A/34gyNZ9El5L7HT6EQgX0gRVazoxw1ttANuq7S5xiecs
+=BaOD
+-----END PGP SIGNATURE-----
diff --git a/x11-plugins/wmxres/wmxres-1.2.ebuild b/x11-plugins/wmxres/wmxres-1.2.ebuild
index 6592b67f30b5..159801d8f70f 100644
--- a/x11-plugins/wmxres/wmxres-1.2.ebuild
+++ b/x11-plugins/wmxres/wmxres-1.2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxres/wmxres-1.2.ebuild,v 1.9 2010/10/05 20:29:16 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmxres/wmxres-1.2.ebuild,v 1.10 2012/07/03 14:15:54 voyageur Exp $
+EAPI=4
inherit eutils multilib toolchain-funcs
DESCRIPTION="Dock application to select your display mode among those possible"
@@ -24,17 +25,15 @@ DEPEND="${RDEPEND}
S=${WORKDIR}/${PN}.app
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
epatch "${FILESDIR}"/${PN}-debian-1.1-1.2.patch
sed -e "s:-g -c -O2:${CFLAGS} -c:" \
- -e "s:cc:$(tc-getCC) \$(LDFLAGS):g" -i Makefile
+ -e "s:\tcc :\t $(tc-getCC) \$(LDFLAGS) :g" \
+ -i Makefile || die "sed failed"
}
src_compile() {
- emake INCDIR="-I/usr/include" \
- LIBDIR="-L/usr/$(get_libdir)" || die "emake failed."
+ emake INCDIR="-I/usr/include" LIBDIR="-L/usr/$(get_libdir)"
}
src_install() {