From 09bd4df7d60111a445e88d9eb7b116d498b9834c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Piotr=20Jaroszy=C5=84ski?= <peper@gentoo.org>
Date: Thu, 28 Dec 2006 01:01:16 +0000
Subject: [PATCH] app-misc/atol: Restrict test, fix multilib and add ~amd64.

svn path=/sunrise/; revision=2509
---
 app-misc/atol/ChangeLog         |  3 +++
 app-misc/atol/Manifest          | 16 ++++++++--------
 app-misc/atol/atol-0.7.3.ebuild | 22 ++++++++++++++++------
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/app-misc/atol/ChangeLog b/app-misc/atol/ChangeLog
index a57b67fbb..2d9525cee 100644
--- a/app-misc/atol/ChangeLog
+++ b/app-misc/atol/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Dec 2006; Piotr Jaroszyński <peper@gentoo.org> atol-0.7.3.ebuild:
+  Restrict test, fix multilib and add ~amd64.
+
   27 Dec 2006; Raul Porcel (armin76) <armin76@gmail.com> +atol-0.7.3.ebuild,
   +files/atol-0.7.3-CFLAGS.patch, +metadata.xml:
   New ebuild for bug 159239
diff --git a/app-misc/atol/Manifest b/app-misc/atol/Manifest
index b51274b31..a4bd43da8 100644
--- a/app-misc/atol/Manifest
+++ b/app-misc/atol/Manifest
@@ -3,14 +3,14 @@ MD5 6718698bf916b868a180156ca6c91d78 files/atol-0.7.3-CFLAGS.patch 5039
 RMD160 9a1ef37fbb863eb22cd05574db9a2ce20dcd632c files/atol-0.7.3-CFLAGS.patch 5039
 SHA256 1dd1492105c60c878cf0967a7b11f393222ed2a687854594532604b98a017a52 files/atol-0.7.3-CFLAGS.patch 5039
 DIST atol-0.7.3_src.tar.gz 1715962 RMD160 e3cc319bbd67b01518adeda41f4b68c67239103f SHA1 4b4463c98ebcc6ccecae2ce9b3044e50cddec95f SHA256 0eab44c12f1a0d00eed45e4e6958c0649c08600993ec453cc0f9b7714109ea37
-EBUILD atol-0.7.3.ebuild 840 RMD160 6b4f91a21317c7caa6ef020954e4bb320489eab6 SHA1 7f31ac0ddcc1be035b5b93b095dbd47543718cc9 SHA256 806870298a4c3196e13721af471fe582043f71ceaa102405dac1b6e2a595ac73
-MD5 02cf8f83cd9671a658c9d330cfc1aab9 atol-0.7.3.ebuild 840
-RMD160 6b4f91a21317c7caa6ef020954e4bb320489eab6 atol-0.7.3.ebuild 840
-SHA256 806870298a4c3196e13721af471fe582043f71ceaa102405dac1b6e2a595ac73 atol-0.7.3.ebuild 840
-MISC ChangeLog 269 RMD160 54c4405b62e45d89506309048a466377fafee781 SHA1 a12ba50c4c6fdab94ceabd85a7dcc7fbda20d164 SHA256 f06fa086f5428c27897fa3746d6601b99c099bac18900975ef78c20def01b1ef
-MD5 17d7c77601c056418ea635c10b30514b ChangeLog 269
-RMD160 54c4405b62e45d89506309048a466377fafee781 ChangeLog 269
-SHA256 f06fa086f5428c27897fa3746d6601b99c099bac18900975ef78c20def01b1ef ChangeLog 269
+EBUILD atol-0.7.3.ebuild 1034 RMD160 5cf5c2b3104bc42269626becafaafe6327d28c3d SHA1 0e1287c59a0b8227c73049a6472c7f91858b59f8 SHA256 5dad358765e3f319f1200dbbce167cd376c9f2b5e63ede30a8e88be0dde8aecb
+MD5 a8be4ccd6394bb9951b8d658ef78ec3b atol-0.7.3.ebuild 1034
+RMD160 5cf5c2b3104bc42269626becafaafe6327d28c3d atol-0.7.3.ebuild 1034
+SHA256 5dad358765e3f319f1200dbbce167cd376c9f2b5e63ede30a8e88be0dde8aecb atol-0.7.3.ebuild 1034
+MISC ChangeLog 388 RMD160 5a18365b717179cc55219fe48f579ee4344fd369 SHA1 381d5a73f543814b7d81480f901c3f8c4c646da8 SHA256 a7554533f1bc82fb85518444f7fa91c856ab22723ec6ae39d3560567337c85d6
+MD5 f9669cb74c06caaef6cd929943c369f9 ChangeLog 388
+RMD160 5a18365b717179cc55219fe48f579ee4344fd369 ChangeLog 388
+SHA256 a7554533f1bc82fb85518444f7fa91c856ab22723ec6ae39d3560567337c85d6 ChangeLog 388
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
diff --git a/app-misc/atol/atol-0.7.3.ebuild b/app-misc/atol/atol-0.7.3.ebuild
index 870652c8d..fc5272572 100644
--- a/app-misc/atol/atol-0.7.3.ebuild
+++ b/app-misc/atol/atol-0.7.3.ebuild
@@ -10,28 +10,38 @@ SRC_URI="mirror://sourceforge/${PN}/${P}_src.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="gnome"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnome test"
 
 RDEPEND=">=x11-libs/gtk+-2.6"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
+	#test? ( dev-util/valgrind )"
+
 MAKEOPTS="${MAKEOPTS} -j1"
 
+# test doesn't work
+RESTRICT="test"
+
 src_unpack() {
-	unpack ${A} && cd ${S}
+	unpack ${A}
+	cd "${S}"
 
 	# Respect CFLAGS and don't use --as-needed by default
-	epatch "$FILESDIR/${P}-CFLAGS.patch"
+	epatch "${FILESDIR}/${P}-CFLAGS.patch"
+
+	# Fix multilib
+	sed -i -e "s#/lib/#/$(get_libdir)/#" "${S}/Makefile" \
+		|| die "multilib sed failed"
 
 	if ! use gnome; then
 		# Comment variable in the Makefile if we don't have gnome
 		sed -i -e 's/HAVE_GNOME_VFS=1/#HAVE_GNOME_VFS=1/g' Makefile || \
-			die "sed failed"
+			die "gnome sed failed"
 	fi
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "make install failed"
 	dodoc readme.txt
 }
-- 
2.43.2