Revision bump: EAPI 4, utilize base eclass, fix bug #442774, drop old revision

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64

4 files changed, 92 insertions, 29 deletions

diff --git a/sys-fs/mhddfs/ChangeLog b/sys-fs/mhddfs/ChangeLog
index 84daa2abef62..76c4112a23e2 100644
--- a/sys-fs/mhddfs/ChangeLog
+++ b/sys-fs/mhddfs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/mhddfs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mhddfs/ChangeLog,v 1.3 2012/11/18 17:46:02 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mhddfs/ChangeLog,v 1.4 2012/11/19 11:36:32 pinkbyte Exp $
+
+*mhddfs-0.1.30-r1 (19 Nov 2012)
+
+  19 Nov 2012; Sergey Popov <pinkbyte@gentoo.org> -mhddfs-0.1.30.ebuild,
+  +mhddfs-0.1.30-r1.ebuild, +files/mhddfs-respect-compiler-vars.patch:
+  Revision bump: EAPI 4, utilize base eclass, fix bug #442774, drop old
+  revision
 
   18 Nov 2012; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Remove beandog wrt #131511
diff --git a/sys-fs/mhddfs/Manifest b/sys-fs/mhddfs/Manifest
index 6f708d6b2aa7..27a17b21d137 100644
--- a/sys-fs/mhddfs/Manifest
+++ b/sys-fs/mhddfs/Manifest
@@ -1,24 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST mhddfs_0.1.30.tar.gz 36983 SHA256 64dc2a4e0bb573bc55382f96b40e577c4e3d965a88904a95d876109d82333a16
-EBUILD mhddfs-0.1.30.ebuild 930 SHA256 774ea57a073963b58c6f74fc3e98a6e70d50f27cfc58796ef750adcd50300773 SHA512 c46e30bf8cf0c53ade6d882966b80984c2354a0c5d31defddb0a9470bc3c8cf570036491df9a321a5420745f69cc79f59f560204445d9628dde8f182f0ff2952 WHIRLPOOL 96963173bd28f0c1229d11752713dd13b2b2da52c530f1d61a94558be3e8e588156754972a935a9e9f5fd06ba9e178e2e1ab794d0ddacf764f4e0b48745b45d0
-MISC ChangeLog 616 SHA256 f32ea57c5b8cda204bee736bda8c5a5b1f83f54f680e23df03359fc7b904c375 SHA512 990e7aa1c171ceafe1d81dc3b67fcc42e1b2b1fb6ce538c23d29a00769a5a56fb30c2f2815ad97e5756fe7ae624ceaf688a5a6c5b10b121162b7378fdfed4fb1 WHIRLPOOL 6650bf033e9792ddd2cf93875ac1d03f68e43f693077aabca9b691dd8810970da04c1e1f88f4b36593525309d165d16675f817d92b201b87091fcba0e0c9be3d
+AUX mhddfs-respect-compiler-vars.patch 1557 SHA256 25f6711b312f931de1f72b81ffa579a0d0e6426eebd30296d9e8d7808471e39e SHA512 8a52b4e4cfd2e619285a99f548374b83b85408584a4be7e7691fbc423b1ea29d482e299d4ed72027b4f571d53457d0d2b1d409f1a515157c9923a7e06bbd90b6 WHIRLPOOL 9522fe3985cb988a472b07d3f6ed29317ec004306e8010591bd1289d309f6bc1be6b3abd2764f6deec873242b153f4a6ebd585bbd9f8587b8bacc4c8f5a5ccd4
+DIST mhddfs_0.1.30.tar.gz 36983 SHA256 64dc2a4e0bb573bc55382f96b40e577c4e3d965a88904a95d876109d82333a16 SHA512 9ed1d957337bc2961acf62054e41b62e856c0230b0a7167b681d0cc797f86a360122aca7d203ae84298bd6e49c0bae042b006098b76ec6cbb764018fb13ed53c WHIRLPOOL b01d21ffb0017f152e6fc61708edaabbb62f8c7a0abebba9ccf8b97274c0d5c55ceb76a7fe53d01536f9b40d5bd80c487653f0cea8ce10b7098b7fa1ef133c41
+EBUILD mhddfs-0.1.30-r1.ebuild 1065 SHA256 a9da79cd09d265a7ae690a0d23b8af1edb7928ebd9d5667663a9b4cecf0b04a6 SHA512 93d42b4d83b1d06ec50b55da23f1909aa82cfc8b4879d4a1a5bf4f94e4d8d39ad770e6bbd49bcbc42dd2975130bd4d798540fe6d5fe32bcc4ac7ffe8d0385b09 WHIRLPOOL 5cb9127cf427e7b2b28076d6917c6d4a2ab003ba30815cf2281c8ccba8bcb8357b6de83e9b93b2d6a9feff1e3e94d1a08def2661f6a409236891a6f14fa33df5
+MISC ChangeLog 877 SHA256 8697cf15ce6daf90b1f86756820d57dbb896d51db055b19ea85a7fd97ceba85f SHA512 d5a5e1ff83ceb7e013529088d97e21393cbf1aef6ddd6f4c4e6f82c04a6e119de31af50c8e8127f4698e0bc0e92bd342b80152892299869dba87224d11c30767 WHIRLPOOL f10e75908db3bee63f819623144800f49d88f3ad6272bacb1221a4a572543b6bf3c08d15cdbfc8e7738fd5561aaa23bf3a3d13e4ab423f1d1c9022e4b4b7937a
 MISC metadata.xml 212 SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757 SHA512 85ac7770baae8cc7c2c52dcd077a448cfb394ec6585e274ffa01c8f92a862d22c6ba0553b71cf2ae6b6f28f6faa5c3d615537f35f9fe0da9f43a2c9043953784 WHIRLPOOL 221b2f4e9b984954eb7268028287339e8678c794c7b4e40ab2baaa037c8e87bac30c8b64473efade9b3ee1ce226aab4ad36760147eee5af7cfd7c081473c839b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQqR7aAAoJEPqDWhW0r/LCBp0P/jzu5jyEiUp5qWK1Thdoo39/
-ub2EnN37WNzQ8gXVn/GM1gvk8BexFWmokRkKOtRmxQ9WiyYubYSiWN9XatqdK7l7
-251PF2G70hPb86FkLlk9Fk+IIVR+ITlbaahTiffosNqy2blLmp2VBPTFXyMw3zzz
-GRCScsNtES82rCesSpFGa60lGsl59Skrp1ehsFsMIR7+nlB369hxM/8CKiASe6A2
-f7OqtOTIHv82LsR0Wo2sIaojKUoaGF+IFVM3N10cDYrjgQuTvjwVSLwUdcUKXacF
-c9hxFBsD/VIKDHGopH5G/s3imwgH1dzxvLelyfJ4QBRFZT22DInonASZE8UYYzi3
-/vGIZOMMQ70u5ercNlGn642Qg4AB9Z9+jQpN0DHEGK63WB4j74BUUAl96E8lOZju
-KHr2wNVZo74j0QjXFI6VdcPpcdk3ebLwKR4IftFnIoRcskuqbJ7uWPbGjcZpvJ21
-IeHkW0MyND6dRHDe9rQa9gRujjNl3wTfqKLtXLZxddamd0cK/JnsTxlfu0YcUTdC
-SvgTmI90MmNKAZoOHmD6ApEzMNF2/vV2PZhJ8beBX6eGToN6h4IGDMiuGm+0axMo
-aO9EutRQdCofQcspfn6KvYZaUMEdH07n81IzRDbGRQsPw/SlYtfN1vEnOExAeVFt
-TgkkGP0e/FZcqm2zU5+e
-=l54V
------END PGP SIGNATURE-----
diff --git a/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch b/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch
new file mode 100644
index 000000000000..331bb7c23f60
--- /dev/null
+++ b/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch
@@ -0,0 +1,66 @@
+--- Makefile.orig	2012-11-19 15:25:21.665692111 +0400
++++ Makefile	2012-11-19 15:27:08.406691288 +0400
+@@ -22,13 +22,13 @@
+ 
+ TARGET	=	mhddfs
+ 
+-CFLAGS	=	-Wall $(shell pkg-config fuse --cflags) \
++CFLAGS	+=	-Wall $(shell pkg-config fuse --cflags) \
+ 			-DFUSE_USE_VERSION=26 -MMD
+ ifdef WITHOUT_XATTR
+ CFLAGS	+=	-DWITHOUT_XATTR
+ endif
+ 
+-LDFLAGS	=	$(shell pkg-config fuse --libs)
++LIBS		=	$(shell pkg-config fuse --libs)
+ 
+ FORTAR	=	src COPYING LICENSE README Makefile \
+ 		README.ru.UTF-8 ChangeLog mhddfs.1 \
+@@ -64,14 +64,14 @@
+ 		$(shell rpm --eval '%_rpmdir')/*/mhddfs-*$(VERSION)-$(RELEASE)* .
+ 
+ $(TARGET): obj/obj-stamp $(OBJ)
+-	gcc $(CFLAGS) $(OBJ) -o $@ $(LDFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o $@
+ 
+ obj/obj-stamp:
+ 	mkdir -p obj
+ 	touch $@
+ 
+ obj/%.o: src/%.c
+-	gcc $(CFLAGS) -c $< -o $@
++	$(CC) $(CFLAGS) -c $< -o $@
+ 
+ clean:
+ 	rm -fr obj $(TARGET) pwrite_test statvfs rename
+@@ -79,7 +79,7 @@
+ 	rm -fr rename-test/mnt
+ 
+ rename: tests/rename.c
+-	gcc -o $@ $<
++	$(CC) -o $@ $<
+ 	
+ release_svn_thread:
+ 	@echo current version $(VERSION)
+@@ -94,10 +94,10 @@
+ 	screen -t vim vim Makefile src/*.[ch] README* ChangeLog mhddfs.1
+ 
+ pwrite_test: src/test/pwrite.c
+-	gcc -o $@ $<
++	$(CC) -o $@ $<
+ 
+ statvfs: src/test/statvfs.c
+-	gcc -o $@ $<
++	$(CC) -o $@ $<
+ 
+ images-mount: test1.img test2.img
+ 	mount|grep -q `pwd`/test1 || sudo mount -o loop test1.img test1
+@@ -141,7 +141,7 @@
+ 	while make test; do echo ok; echo; done
+ 
+ ptest:
+-	gcc -o $@ tests/plocks.c -l pthread
++	$(CC) -o $@ tests/plocks.c -l pthread
+ 	-./$@
+ 	rm -f $@
+ 
diff --git a/sys-fs/mhddfs/mhddfs-0.1.30.ebuild b/sys-fs/mhddfs/mhddfs-0.1.30-r1.ebuild
index eef51a3a9f87..02d178b8c23c 100644
--- a/sys-fs/mhddfs/mhddfs-0.1.30.ebuild
+++ b/sys-fs/mhddfs/mhddfs-0.1.30-r1.ebuild
@@ -1,8 +1,10 @@
-# 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/sys-fs/mhddfs/mhddfs-0.1.30.ebuild,v 1.2 2010/04/25 03:19:25 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mhddfs/mhddfs-0.1.30-r1.ebuild,v 1.1 2012/11/19 11:36:31 pinkbyte Exp $
 
-inherit eutils
+EAPI=4
+
+inherit base eutils
 
 MY_P="${PN}_${PV}"
 
@@ -17,10 +19,17 @@ IUSE="suid"
 
 DEPEND=">=sys-fs/fuse-2.7.0"
 
-src_install(){
+DOCS="ChangeLog README README.ru.UTF-8"
+PATCHES=( "${FILESDIR}/${PN}-respect-compiler-vars.patch" )
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
 	dobin mhddfs
 	doman mhddfs.1
-	dodoc ChangeLog README README.ru.UTF-8
+	dodoc ${DOCS}
 	use suid && fperms u+s /usr/bin/${PN}
 }