amd64 keyworded. Sets CFLAGS rather than AM_CFLAGS, so user CFLAGS are ignored, bug #90723

Package-Manager: portage-2.0.51.21-r1

4 files changed, 56 insertions, 5 deletions

diff --git a/app-laptop/acpitool/ChangeLog b/app-laptop/acpitool/ChangeLog
index 2a11058be37a..7a25b8e63421 100644
--- a/app-laptop/acpitool/ChangeLog
+++ b/app-laptop/acpitool/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-laptop/acpitool
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/acpitool/ChangeLog,v 1.5 2005/01/01 14:45:11 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/acpitool/ChangeLog,v 1.6 2005/05/07 10:00:21 sekretarz Exp $
+
+  07 May 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/acpitool-0.2.6-gentoo.patch, acpitool-0.2.6.ebuild:
+  amd64 keyworded. Sets CFLAGS rather than AM_CFLAGS, so user CFLAGS are
+  ignored, bug #90723
 
 *acpitool-0.2.6 (08 Dec 2004)
 
diff --git a/app-laptop/acpitool/Manifest b/app-laptop/acpitool/Manifest
index 023632e892e6..10dd7547d286 100644
--- a/app-laptop/acpitool/Manifest
+++ b/app-laptop/acpitool/Manifest
@@ -1,6 +1,17 @@
-MD5 b8efb279d93a5e964bfa015bebe64446 ChangeLog 748
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 56555fe1c9c2c5daf611d33cd54882f7 acpitool-0.2.6.ebuild 821
 MD5 bef17e15dd04e689b0ab7990676d06bd acpitool-0.2.5.ebuild 672
+MD5 725ebeb6ccb4d23b7fd131dd37b2294a ChangeLog 958
 MD5 8629d3ef30ef3be4b273182406eef4f2 metadata.xml 224
-MD5 398a22a96f602f61044694e0ccd4a587 acpitool-0.2.6.ebuild 690
 MD5 138ad9564f4baf72faa419739abf111c files/digest-acpitool-0.2.5 66
 MD5 451f8882f44f7b7dc0967841a64dcac0 files/digest-acpitool-0.2.6 66
+MD5 5b1fe7a8b6adfcf261f4131004973a83 files/acpitool-0.2.6-gentoo.patch 823
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCfJIWZ/iYVBmujdURAgUIAKDwJrKkNtPyJgIshgyNHm8KfipORQCfRelb
++U9fj2IfZaIaf9C7b4CR3As=
+=tZNM
+-----END PGP SIGNATURE-----
diff --git a/app-laptop/acpitool/acpitool-0.2.6.ebuild b/app-laptop/acpitool/acpitool-0.2.6.ebuild
index 949768e587c2..016b49a72158 100644
--- a/app-laptop/acpitool/acpitool-0.2.6.ebuild
+++ b/app-laptop/acpitool/acpitool-0.2.6.ebuild
@@ -1,16 +1,27 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/acpitool/acpitool-0.2.6.ebuild,v 1.2 2005/01/01 14:45:11 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/acpitool/acpitool-0.2.6.ebuild,v 1.3 2005/05/07 10:00:21 sekretarz Exp $
+
+inherit libtool eutils
 
 DESCRIPTION="A small command line application, intended to be a replacement for the apm tool"
 HOMEPAGE="http://freeunix.dyndns.org:8088/site2/acpitool.shtml"
 SRC_URI="http://freeunix.dyndns.org:8088/ftp_site/pub/unix/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
 DEPEND=""
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-gentoo.patch
+	autoreconf
+	automake
+}
+
 src_compile() {
 	econf || die "econf failed"
 	emake || die "emake failed"
diff --git a/app-laptop/acpitool/files/acpitool-0.2.6-gentoo.patch b/app-laptop/acpitool/files/acpitool-0.2.6-gentoo.patch
new file mode 100644
index 000000000000..b80d072830dc
--- /dev/null
+++ b/app-laptop/acpitool/files/acpitool-0.2.6-gentoo.patch
@@ -0,0 +1,24 @@
+diff -Naur acpitool-0.2.6.orig/configure.in acpitool-0.2.6/configure.in
+--- acpitool-0.2.6.orig/configure.in	2004-11-28 18:19:14.000000000 +0100
++++ acpitool-0.2.6/configure.in	2005-05-07 11:47:40.935057296 +0200
+@@ -11,7 +11,7 @@
+ 
+ # Put the following line in comment and rerun autoconf if you really want
+ # to compile with -g (=debugging on, seems to be default)
+-CXXFLAGS=""
++#CXXFLAGS=""
+ 
+ # Checks for libraries.
+ 
+diff -Naur acpitool-0.2.6.orig/src/Makefile.am acpitool-0.2.6/src/Makefile.am
+--- acpitool-0.2.6.orig/src/Makefile.am	2004-08-29 01:49:11.000000000 +0200
++++ acpitool-0.2.6/src/Makefile.am	2005-05-07 11:47:53.195193472 +0200
+@@ -2,7 +2,7 @@
+ 
+ acpitool_SOURCES = main.cpp acpitool.cpp toshiba.cpp
+ 
+-AM_CXXFLAGS = -O2 -Wall -march=i686
++AM_CXXFLAGS = ${CFLAGS}
+ 
+ EXTRA_DIST = acpitool.h toshiba.h
+