diff options
author | Jeroen Roovers <jer@gentoo.org> | 2010-09-20 20:16:27 +0000 |
---|---|---|
committer | Jeroen Roovers <jer@gentoo.org> | 2010-09-20 20:16:27 +0000 |
commit | 34a640f626dfc3d04a86a473e17a425719e1a3de (patch) | |
tree | 00d51d683771545236cae91da11dece49426b76d /sys-fs | |
parent | Stable on amd64 wrt bug #337328 (diff) | |
download | historical-34a640f626dfc3d04a86a473e17a425719e1a3de.tar.gz historical-34a640f626dfc3d04a86a473e17a425719e1a3de.tar.bz2 historical-34a640f626dfc3d04a86a473e17a425719e1a3de.zip |
Version bump. Respect LDFLAGS (bug #336538), CC, CFLAGS. Set RDEPEND.
Package-Manager: portage-2.2_rc84/cvs/Linux i686
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/copyfs/ChangeLog | 10 | ||||
-rw-r--r-- | sys-fs/copyfs/Manifest | 7 | ||||
-rw-r--r-- | sys-fs/copyfs/copyfs-1.0.1.ebuild | 44 | ||||
-rw-r--r-- | sys-fs/copyfs/files/copyfs-1.0-unlink.patch | 1 | ||||
-rw-r--r-- | sys-fs/copyfs/files/copyfs-1.0.1-gentoo.patch | 46 |
5 files changed, 103 insertions, 5 deletions
diff --git a/sys-fs/copyfs/ChangeLog b/sys-fs/copyfs/ChangeLog index c3da06b8ed41..6d7c2ee6148d 100644 --- a/sys-fs/copyfs/ChangeLog +++ b/sys-fs/copyfs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/copyfs -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/copyfs/ChangeLog,v 1.5 2007/07/02 15:32:49 peper Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/copyfs/ChangeLog,v 1.6 2010/09/20 20:16:26 jer Exp $ + +*copyfs-1.0.1 (20 Sep 2010) + + 20 Sep 2010; Jeroen Roovers <jer@gentoo.org> +copyfs-1.0.1.ebuild, + +files/copyfs-1.0.1-gentoo.patch, files/copyfs-1.0-unlink.patch: + Version bump. Respect LDFLAGS (bug #336538), CC, CFLAGS. Set RDEPEND. 02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org> copyfs-1.0.ebuild: (QA) RESTRICT clean up. diff --git a/sys-fs/copyfs/Manifest b/sys-fs/copyfs/Manifest index c0d91087c231..8db258b670dc 100644 --- a/sys-fs/copyfs/Manifest +++ b/sys-fs/copyfs/Manifest @@ -1,6 +1,9 @@ AUX copyfs-1.0-gentoo.patch 1330 RMD160 57dfd78ceb3bdd85676d08506a4fc000dbf6f747 SHA1 078f95a2746ac498deb402696f282fe51fef1dd8 SHA256 a24c9d159df3bd03e9dde9baefb3316a317752f93c22e60a48848d3a35b1d4c6 -AUX copyfs-1.0-unlink.patch 4412 RMD160 5a316ca69af4d390f3c7e2db9a46f2fd97da330e SHA1 87b1fcad83aa5f8c9a1c58cf9050b71325e69f6e SHA256 1d3c9d7364ea7b121e29e93aaa626c085dca5565d5b0910ff33ce22c14927912 +AUX copyfs-1.0-unlink.patch 4383 RMD160 c8d6416d53a452c188c0089288faaaeb861df23b SHA1 6a182fd50894522d5c5354e34d084e64e3214355 SHA256 b442e18bf37b108e661fb641e463cb64d919308a5c9b09c5817fc7f04703f0c1 +AUX copyfs-1.0.1-gentoo.patch 999 RMD160 c49fce633bf042db53f2ead74d9b1bfbf9b16fcf SHA1 81a29196c739fff9e7ba745310a4218d515849fa SHA256 6571725e25606c3da8085f442df6a06c3bea93263f2fdf1dc4726cbf21c37c52 +DIST copyfs-1.0.1.tar.bz2 38429 RMD160 0046c2eb915bbb5422c158017d366293fa2f6193 SHA1 1ac151a2f5a15d0bf6b87a18ac2931737391bb8f SHA256 63022f60e2c6b488bef509add0e7cdb41d597ded22a70c1c6ae74ab4a6b7e0f7 DIST copyfs-1.0.tar.bz2 30713 RMD160 73c5b6d94a77d72715aaf658808f7d6c77d12eda SHA1 2dd02b241444ea4924c3818808668992e585d0f5 SHA256 e62a1d0fa6aa049c7f7ff10ffe53d72bf2b7d4454d6e79e99e6fc3a13e3c399a +EBUILD copyfs-1.0.1.ebuild 1112 RMD160 0bdcd404aa8f8c561a6bb5619bc2b4769843a8f8 SHA1 1a63ce0c2f5a501ffab83f0a149398685d555f34 SHA256 2b5b02cf665f819315581d7f0bd4677107b41e2448886ebed7a93f7f45947b9b EBUILD copyfs-1.0.ebuild 958 RMD160 2f0e4ac0a007452211697fa084e14c1059e16eb8 SHA1 5bf82c19d25521729d787d29777a8b0d1aed1fed SHA256 7c741533ed609fcb6f77ddef182e8dde34efec207b1835cbb6c8dd861109bd99 -MISC ChangeLog 842 RMD160 83c597f4c6e44da879f309c023e541ce946bb7da SHA1 1c337806f9cf3dc45f9882030f6b538e846d1783 SHA256 90feaac795d74d5b50a711cdc4af6a415179f0efe7486126f2fdcd72b0359baa +MISC ChangeLog 1078 RMD160 5e01acccaecfd593208617d1087981786fb20278 SHA1 77544d947ef2f9d1de3badbdee89e105e98c0dba SHA256 071cbe59b9794d561b39191befeaa57e98c2867445c6594c5f509f58afa5a463 MISC metadata.xml 311 RMD160 bfddf7409cde9869749748809a39b8a9452e5341 SHA1 e5bf7c70d7447a947184318cf2a55472730f0f2c SHA256 681abaed7fabc30bb145bc6ea96ef506bcbe5a29be69ff370d25494e73fe1431 diff --git a/sys-fs/copyfs/copyfs-1.0.1.ebuild b/sys-fs/copyfs/copyfs-1.0.1.ebuild new file mode 100644 index 000000000000..fb2ff9197065 --- /dev/null +++ b/sys-fs/copyfs/copyfs-1.0.1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/copyfs/copyfs-1.0.1.ebuild,v 1.1 2010/09/20 20:16:26 jer Exp $ + +EAPI="2" + +inherit autotools eutils toolchain-funcs + +DESCRIPTION="fuse-based filesystem for maintaining configuration files" +HOMEPAGE="http://invaders.mars-attacks.org/~boklm/copyfs/" +SRC_URI="${HOMEPAGE}/${P}.tar.bz2" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64 ~ppc" +IUSE="" + +DEPEND=">=sys-fs/fuse-2.0 + sys-apps/attr" +RDEPEND="${DEPEND}" + +src_prepare() { + # this patch fixes sandbox violations + epatch "${FILESDIR}"/${P}-gentoo.patch + + # this patch adds support for cleaning up the versions directory + # the patch is experimental at best, but it's better than your + # versions directory filling up with unused files + # + # patch by stuart@gentoo.org + epatch "${FILESDIR}"/${PN}-1.0-unlink.patch + eautoreconf +} + +src_configure() { + econf --bindir="${D}/usr/bin" --mandir="${D}/usr/share/man" +} + +src_compile() { + emake CC=$(tc-getCC) || die +} + +src_install() { + emake DESTDIR="${D}" install || die +} diff --git a/sys-fs/copyfs/files/copyfs-1.0-unlink.patch b/sys-fs/copyfs/files/copyfs-1.0-unlink.patch index 9e6614f54271..f4ee28fae148 100644 --- a/sys-fs/copyfs/files/copyfs-1.0-unlink.patch +++ b/sys-fs/copyfs/files/copyfs-1.0-unlink.patch @@ -1,4 +1,3 @@ -Only in copyfs-1.0: Makefile diff -u --recursive copyfs-1.0-orig/cache.c copyfs-1.0/cache.c --- copyfs-1.0-orig/cache.c 2004-12-10 13:34:08.000000000 +0000 +++ copyfs-1.0/cache.c 2004-12-18 20:30:17.945445677 +0000 diff --git a/sys-fs/copyfs/files/copyfs-1.0.1-gentoo.patch b/sys-fs/copyfs/files/copyfs-1.0.1-gentoo.patch new file mode 100644 index 000000000000..f0ddfab94af4 --- /dev/null +++ b/sys-fs/copyfs/files/copyfs-1.0.1-gentoo.patch @@ -0,0 +1,46 @@ +--- a/ea.c ++++ b/ea.c +@@ -1,10 +1,11 @@ + #include <sys/types.h> + #include <sys/stat.h> +-#include <attr/xattr.h> ++#include <sys/xattr.h> + #include <string.h> + #include <stdlib.h> + #include <stdio.h> + #include <fuse.h> ++#include <sys/errno.h> + + #include "helper.h" + #include "structs.h" +--- a/interface.c ++++ b/interface.c +@@ -23,7 +23,7 @@ + #include <errno.h> + #include <sys/stat.h> + #include <stdlib.h> +-#include <attr/xattr.h> ++#include <sys/xattr.h> + #include <sys/time.h> + #include <time.h> + +--- a/Makefile.in ++++ b/Makefile.in +@@ -27,7 +27,7 @@ + OBJ = $(SRC:.c=.o) + + CC = gcc +-CFLAGS = -Wall -ansi -W -std=c99 -g -ggdb -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ++CFLAGS += -Wall -ansi -W -std=c99 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 + LIBS = -lfuse + + all: $(TARGET) +@@ -54,7 +54,7 @@ + rm -rf /tmp/copyfs-dist + + $(TARGET): $(OBJ) +- gcc -o $(TARGET) $(OBJ) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJ) $(LIBS) + + # Dependencies (use gcc -MM -D_FILE_OFFSET_BITS=64 *.c to regenerate) + |