| 1 |
nyhm 10/09/03 08:43:30 |
| 2 |
|
| 3 |
Modified: ChangeLog keytouch-2.4.1.ebuild |
| 4 |
Log: |
| 5 |
Respect CFLAGS/LDFLAGS when building plugins, bug #333975 |
| 6 |
|
| 7 |
(Portage version: 2.2_rc73/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.19 x11-misc/keytouch/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/keytouch/ChangeLog?rev=1.19&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/keytouch/ChangeLog?rev=1.19&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/keytouch/ChangeLog?r1=1.18&r2=1.19 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/keytouch/ChangeLog,v |
| 19 |
retrieving revision 1.18 |
| 20 |
retrieving revision 1.19 |
| 21 |
diff -u -r1.18 -r1.19 |
| 22 |
--- ChangeLog 10 Jan 2010 08:17:42 -0000 1.18 |
| 23 |
+++ ChangeLog 3 Sep 2010 08:43:30 -0000 1.19 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for x11-misc/keytouch |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/keytouch/ChangeLog,v 1.18 2010/01/10 08:17:42 robbat2 Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/keytouch/ChangeLog,v 1.19 2010/09/03 08:43:30 nyhm Exp $ |
| 29 |
+ |
| 30 |
+ 03 Sep 2010; Tristan Heaven <nyhm@g.o> keytouch-2.4.1.ebuild: |
| 31 |
+ Respect CFLAGS/LDFLAGS when building plugins, bug #333975 |
| 32 |
|
| 33 |
10 Jan 2010; Robin H. Johnson <robbat2@g.o> keytouch-2.4.1.ebuild: |
| 34 |
Bug #283320 cleanup: linux_config_exists before linux_chkconfig*. |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.4 x11-misc/keytouch/keytouch-2.4.1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/keytouch/keytouch-2.4.1.ebuild?rev=1.4&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/keytouch/keytouch-2.4.1.ebuild?rev=1.4&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/keytouch/keytouch-2.4.1.ebuild?r1=1.3&r2=1.4 |
| 43 |
|
| 44 |
Index: keytouch-2.4.1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/x11-misc/keytouch/keytouch-2.4.1.ebuild,v |
| 47 |
retrieving revision 1.3 |
| 48 |
retrieving revision 1.4 |
| 49 |
diff -u -r1.3 -r1.4 |
| 50 |
--- keytouch-2.4.1.ebuild 10 Jan 2010 08:17:42 -0000 1.3 |
| 51 |
+++ keytouch-2.4.1.ebuild 3 Sep 2010 08:43:30 -0000 1.4 |
| 52 |
@@ -1,7 +1,8 @@ |
| 53 |
# Copyright 1999-2010 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/keytouch/keytouch-2.4.1.ebuild,v 1.3 2010/01/10 08:17:42 robbat2 Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/keytouch/keytouch-2.4.1.ebuild,v 1.4 2010/09/03 08:43:30 nyhm Exp $ |
| 57 |
|
| 58 |
+EAPI=2 |
| 59 |
inherit eutils linux-info |
| 60 |
|
| 61 |
DESCRIPTION="Easily configure extra keyboard function keys" |
| 62 |
@@ -30,26 +31,35 @@ |
| 63 |
) ) |
| 64 |
!kde? ( x11-libs/gksu )" |
| 65 |
|
| 66 |
-src_unpack() { |
| 67 |
- unpack ${A} |
| 68 |
- cd "${S}" |
| 69 |
+src_prepare() { |
| 70 |
epatch "${FILESDIR}"/${P}-glibc28.patch |
| 71 |
sed -i \ |
| 72 |
's/install-data-local//1' \ |
| 73 |
keytouch{-acpid,d,-init}/Makefile.in \ |
| 74 |
|| die "sed failed" |
| 75 |
+ sed -i \ |
| 76 |
+ -e '/^CFLAGS/s:\(.*\)=\(.*\)-O2:\1+=\2$(LDFLAGS):' \ |
| 77 |
+ {mxml,plugins}/Makefile.in \ |
| 78 |
+ || die "sed failed" |
| 79 |
} |
| 80 |
|
| 81 |
-src_compile() { |
| 82 |
+d_iter() { |
| 83 |
local d |
| 84 |
for d in . keytouch-config keytouch-keyboard ; do |
| 85 |
pushd ${d} > /dev/null |
| 86 |
- econf || die |
| 87 |
- emake || die "emake ${d} failed" |
| 88 |
+ eval "${1}" |
| 89 |
popd > /dev/null |
| 90 |
done |
| 91 |
} |
| 92 |
|
| 93 |
+src_configure() { |
| 94 |
+ d_iter 'econf' |
| 95 |
+} |
| 96 |
+ |
| 97 |
+src_compile() { |
| 98 |
+ d_iter 'emake || die "emake ${d} failed"' |
| 99 |
+} |
| 100 |
+ |
| 101 |
src_install() { |
| 102 |
if use acpi ; then |
| 103 |
newinitd "${FILESDIR}"/${PN}-acpid ${PN} || die "newinitd failed" |
| 104 |
@@ -62,11 +72,7 @@ |
| 105 |
|
| 106 |
dodoc AUTHORS ChangeLog |
| 107 |
|
| 108 |
- local d |
| 109 |
- for d in . keytouch-config keytouch-keyboard ; do |
| 110 |
- emake -C ${d} DESTDIR="${D}" install \ |
| 111 |
- || die "emake install ${d} failed" |
| 112 |
- done |
| 113 |
+ d_iter 'emake DESTDIR="${D}" install || die "emake install ${d} failed"' |
| 114 |
} |
| 115 |
|
| 116 |
pkg_postinst() { |
Archives