From ee12d125ce2fba49531c7a86f1d73f2ae29b09ae Mon Sep 17 00:00:00 2001
From: Henry Gebhardt <hsggebhardt@googlemail.com>
Date: Sun, 10 Jul 2011 15:27:33 +0200
Subject: >=app-backup/bup-0.25-rc1: Fix configure phase

---
 app-backup/bup/Manifest            |  4 ++--
 app-backup/bup/bup-0.25_rc1.ebuild | 15 ++++++++++++++-
 app-backup/bup/bup-9999.ebuild     | 15 ++++++++++++++-
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/app-backup/bup/Manifest b/app-backup/bup/Manifest
index f2da970..dcfa5e1 100644
--- a/app-backup/bup/Manifest
+++ b/app-backup/bup/Manifest
@@ -1,5 +1,5 @@
 DIST bup-0.24b.tar.gz 330630 RMD160 f2c3474c9f5467ad95153725947cc6c3a016f0f0 SHA1 478aa11b9f1ecc72d6d1ca07fb543042d152b81e SHA256 10674d25ec3a6a63525e4c5e7ba36cf08cee5a2d1d6bfc9306d2a560dbade429
 DIST bup-0.25_rc1.tar.gz 360010 RMD160 52addf38b0a2e1ed6f3ce496b43512619a9f64ff SHA1 04815a9f1c1d4d796b9f7f09401c49240b21b84a SHA256 b04186b48d2f6fc5a679c343c93e785ea2716d267c5c9621086a9d313fd2bea1
 EBUILD bup-0.24b.ebuild 903 RMD160 c77423cad8e4d7500bc0efbb4fc50dbfb49788b0 SHA1 afdb8ee091a4823a564edca06756175a51e15adb SHA256 dde24118b3f251744097d646c460b2086b1de89aea7613ea14a88b6c9203d4a0
-EBUILD bup-0.25_rc1.ebuild 903 RMD160 c77423cad8e4d7500bc0efbb4fc50dbfb49788b0 SHA1 afdb8ee091a4823a564edca06756175a51e15adb SHA256 dde24118b3f251744097d646c460b2086b1de89aea7613ea14a88b6c9203d4a0
-EBUILD bup-9999.ebuild 817 RMD160 de831b53c2ddd6ec9ea9231ab118364b833252f0 SHA1 b459ef2247d4c9917531989499a545c75fc5d287 SHA256 54c49e159170318ae927eda2f672c01b7f83d5ba17c4d55638c6294525cd871b
+EBUILD bup-0.25_rc1.ebuild 1171 RMD160 a14f705c52d35885c32d7c2daa014d041842caf1 SHA1 0196510beb7189e48d8e20d49bde4e8bdf3c8320 SHA256 e4f211105646c43e45eaf9a881ac40051be6cafb355c2c6590e360c47ec33600
+EBUILD bup-9999.ebuild 1085 RMD160 131fc38da8f573a8f1cd137be550c368ec36651c SHA1 0e922137111dd6fb061af6c06ac744ed0f4103d7 SHA256 32ded95b1435d92a0e872aef26316046a4a7674f2044fa0b1ad46b770d5c9464
diff --git a/app-backup/bup/bup-0.25_rc1.ebuild b/app-backup/bup/bup-0.25_rc1.ebuild
index 0107e7d..eaeb0b9 100644
--- a/app-backup/bup/bup-0.25_rc1.ebuild
+++ b/app-backup/bup/bup-0.25_rc1.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=4
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="It backs things up based on the git packfile format"
 HOMEPAGE="http://github.com/apenwarr/bup"
@@ -31,6 +31,19 @@ src_unpack() {
 	mv -v * "${S}" || die
 }
 
+src_configure() {
+	# bup doesn't accept --build= option
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--datadir=/usr/share \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		--libdir=/usr/"$(get_libdir)"
+
+}
+
 src_compile() {
 	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
diff --git a/app-backup/bup/bup-9999.ebuild b/app-backup/bup/bup-9999.ebuild
index 1601f84..f64af75 100644
--- a/app-backup/bup/bup-9999.ebuild
+++ b/app-backup/bup/bup-9999.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=4
-inherit git eutils
+inherit git eutils multilib
 
 DESCRIPTION="It backs things up based on the git packfile format"
 HOMEPAGE="http://github.com/apenwarr/bup"
@@ -26,6 +26,19 @@ DEPEND="|| (
 		doc? ( app-text/pandoc )"
 RDEPEND="${DEPEND}"
 
+src_configure() {
+	# bup doesn't accept --build= option
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--datadir=/usr/share \
+		--sysconfdir=/etc \
+		--localstatedir=/var/lib \
+		--libdir=/usr/"$(get_libdir)"
+
+}
+
 src_compile() {
 	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
-- 
cgit v1.2.3-65-gdbad