diff --git a/sys-fs/reiser4progs/ChangeLog b/sys-fs/reiser4progs/ChangeLog index a577aec0..29a5b3fc 100644 --- a/sys-fs/reiser4progs/ChangeLog +++ b/sys-fs/reiser4progs/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for sys-fs/reiser4progs -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/ChangeLog,v 1.41 2010/07/11 00:34:26 ranger Exp $ +*reiser4progs-1.0.9 (14 Jul 2014) + + 14 Jul 2014; Mario Fetka + +files/reiser4progs-1.0.7-readline-6.3.patch, +reiser4progs-1.0.9.ebuild, + -files/reiser4progs-1.0.7-gcc-4.4.patch, -reiser4progs-1.0.8.ebuild: + Bump + *reiser4progs-1.0.8 (31 Oct 2013) 31 Oct 2013; Mario Fetka +reiser4progs-1.0.8.ebuild, diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest index f5583587..74a478a2 100644 --- a/sys-fs/reiser4progs/Manifest +++ b/sys-fs/reiser4progs/Manifest @@ -1,6 +1,6 @@ -AUX reiser4progs-1.0.7-gcc-4.4.patch 311 SHA256 5d0fc888af703911457f42b16d4da76cfdcb5c38c08387c21f5f5e4e111160bf SHA512 940fc154fadec21a701ef7914a6b4ef1067fc954101219b2949bf8721e97deb8d832ae288c930a59060ba3171f94bfed5924c8ac6b8c30c655fd0ca09f0bff1a WHIRLPOOL 94f00f3e9a876c990b42a7eec3793d7f31696c2e689b70a411bb6cbe639e6ef69fa431db9e5f01ad20a0beb78eff54c185b669287922f9299dd090e906cc35db +AUX reiser4progs-1.0.7-readline-6.3.patch 472 SHA256 764f820b7f933270ab00138610243ad11926a326c5d9668d8566e758dc220b49 SHA512 0162505148699f8e5270314be586d8db7d42f9ea5fc8517b5475aa59f54b47eb626349c36820cc34c0490e0c3df1597a230c27abf316226cc7d261e986963788 WHIRLPOOL fe6fda5bea8535ceac3a066896a2836419d04595d1f538d97bb29d5d2e01b60943a0acac0f34990cd333ebef3c7a5a8b3281c90584b5d7c86e9263d779030aa0 AUX reiser4progs_1.0.7-6.diff 898 SHA256 2720a6f288f405779f9c7d4084756f673ca694716a6eb694602a6368c0813ecd SHA512 917a332f466eb3b51bced189a7ffb3e4b2be87a6aa07bd5874091bbbb4a7c84ff6b3292785cc04fedc433fe7a44b62e1b1b83d890e90d733b2f2d4ec8a3df9bc WHIRLPOOL 125d9ecc02698e949c91a2f86412c9c7f65a1ffdfd0e04238abe1a8bc75c67d12c87b9095d22f0625bd9d187e84420c159165e45795cc5bc28bb1df5f87e1f20 -DIST reiser4progs-1.0.8.tar.gz 866466 SHA256 186e2f8619cf66a79654789be044781dd656cbd4a3c4f514da3516301226b086 SHA512 d49de6d191fc842d5f7dad447b1e8ac2bec4c18e40096ad4911766153688fe558374fbb34eb510ec5c9a929e64edb2c14e11f6d0ac2c247e1978fd766bd24116 WHIRLPOOL 83a0422f77ce4035410a10c727b8f0193c071e046b74b2359db566d83fc8a22906454401f0a15e53dee26cbf7b723b4993e71bb207792d56f39dddcd13993c6d -EBUILD reiser4progs-1.0.8.ebuild 1626 SHA256 fd1f1b04bb7ff663774c2f36c3b39b382fc53f85b5c2f539cb43140405ee0711 SHA512 84dbbdc5568f9986d671e6bbc832886f729a21c459df10370834a74f0da0f4ffa42b2320bb1ac12ccdd61e4a2488dfc2e630fbc0fc1eaf9d6ee659cd071b85ad WHIRLPOOL 22e2367b42f0ff5a04c921c53a2442538d2090c722d200485b823cf389aa40f8e3c7968e1ff0bdeab733fe8cdffd418cbf766c1854f68e31e43421375fd14e6d -MISC ChangeLog 6244 SHA256 513c39b8b339465428a063b0e4d2b1be0e468c1377caf695ee51b4309110adeb SHA512 9b688c40e9b6f51d53470068a46b8e45570e4dc04fba07773fc64cc82c80b1bcaacec1c9aeee78d1767ed9a77f090e4bdc3914a4aaf5e8957e736530b0c29a1e WHIRLPOOL b68400b6fbae8fbb09c9e06cfd25599b7810d605b6992e40057848ef51acb192f45736ea63a7817f1f5c65906e5eb52e79559716808e2a80c40884896ed1dcf7 +DIST reiser4progs-1.0.9.tar.gz 913470 SHA256 ffb027c83b0080e86f7cbe238c1e185ab09225f962a171245e7f4b7e9a97cd34 SHA512 1aa3cc1a59081d4987c94fc0dda42b9b64329e8187483809968438d2c7b1152eed23d3d6682aabe2216e1aee50f9653120a0bc4fe798195d6a1cf9c43c9508b0 WHIRLPOOL 6cd385b506ac52fe44f7b8cca3a0c4815b59c22e200a25898eba5c5a5e6491b16d7e1fedd074ac58e748437df084e40a4e92059081a51a6a30b4e0e4a9945a17 +EBUILD reiser4progs-1.0.9.ebuild 1412 SHA256 10c0c375f16ee0ff6096e875324ab8517ada9ac33600e61bafec8a90f5bb674e SHA512 4304438e34d09c1364749f38de7d46564962fa173d6b2d7923564628b0c8966e066b17744a14737848e078c1474247c83779a50c76c571b27293e3537cd1837d WHIRLPOOL 670a01e179035cc5b50ada639d73b5735941c4061e7ec0c6eaffa4a1f714739e525f889e48b30ea57c65a57077ef2c2c56ffc806d4935d4e0037950da3ffa34c +MISC ChangeLog 6485 SHA256 115f674ccb1bec6d6efed48d4122656f4d6a8ccf21ddca4485c41cf2d3872d2d SHA512 3eea5ea7458cb496aa541980db36077dc703d5e4e585619c214835f5cf7ec975010fc831b0dea2259d615bfa384165baf6338bcb389305b39350ddf20dc99b2c WHIRLPOOL cf704d6055b06488bc2afca92de7c53e2f21909631aedf3b2d8f80388e095358af33b8ae5df840a1db73f7ad40fa4f32faa75af365d3954f3d6033ba88190f0c MISC metadata.xml 267 SHA256 afd6f362214e67e2c73e745c7bb7e78c46c190a9c9ecf0712722850d23515e6b SHA512 9c577b7491c6865a0010947f6be695e1c8c31a03e0b14fee4d21ccde81229f981a57f95ac6d59eaf496c0b1a3ff117375733dd93bdc3228f097c31da4bb64ae9 WHIRLPOOL 94c08b3e4a38b8085b090d73f27645470d22d324fdf5d8f764c22b9e69b13f2bfefe89ceb76fcf59f29f4851ca13001877f9b3acce718f3bcfd6d4db362063f6 diff --git a/sys-fs/reiser4progs/files/reiser4progs-1.0.7-gcc-4.4.patch b/sys-fs/reiser4progs/files/reiser4progs-1.0.7-gcc-4.4.patch deleted file mode 100644 index 3f32af5d..00000000 --- a/sys-fs/reiser4progs/files/reiser4progs-1.0.7-gcc-4.4.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://bugs.gentoo.org/269240 - -fix build failure when using gcc-4.4 - ---- reiser4progs-1.0.7/plugin/node/node40/node40.c -+++ reiser4progs-1.0.7/plugin/node/node40/node40.c -@@ -994,7 +994,7 @@ - func = cb_comp_key3; - #elif defined(ENABLE_LARGE_KEYS) - func = cb_comp_key4; --#elif -+#else - func = NULL; - #endif - diff --git a/sys-fs/reiser4progs/files/reiser4progs-1.0.7-readline-6.3.patch b/sys-fs/reiser4progs/files/reiser4progs-1.0.7-readline-6.3.patch new file mode 100644 index 00000000..9de53bd4 --- /dev/null +++ b/sys-fs/reiser4progs/files/reiser4progs-1.0.7-readline-6.3.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/504472 + +fix building w/readline-6.3 -- the old CPPFunction define has been deleted + +--- a/libmisc/ui.c ++++ b/libmisc/ui.c +@@ -256,8 +256,7 @@ static void _init(void) { + + #if defined(HAVE_LIBREADLINE) && defined(HAVE_READLINE_READLINE_H) + rl_initialize(); +- rl_attempted_completion_function = +- (CPPFunction *)misc_complete; ++ rl_attempted_completion_function = misc_complete; + #endif + + aal_exception_set_handler(misc_exception_handler); diff --git a/sys-fs/reiser4progs/reiser4progs-1.0.8.ebuild b/sys-fs/reiser4progs/reiser4progs-1.0.8.ebuild deleted file mode 100644 index cc753e96..00000000 --- a/sys-fs/reiser4progs/reiser4progs-1.0.8.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.7.ebuild,v 1.8 2012/05/24 02:54:11 vapier Exp $ - -inherit multilib eutils toolchain-funcs - -MY_P=${PN}-${PV/_p/-} -DESCRIPTION="reiser4progs: mkfs, fsck, etc..." -HOMEPAGE="http://www.kernel.org/pub/linux/utils/fs/reiser4/reiser4progs/" -SRC_URI="http://sourceforge.net/projects/reiser4/files/reiser4-utils/reiser4progs/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 -sparc x86" -IUSE="static debug readline" - -DEPEND="~sys-libs/libaal-1.0.5 - readline? ( sys-libs/readline )" - -S=${WORKDIR}/${MY_P} - -src_unpack() { - unpack ${A} - cd "${S}" - #epatch "${FILESDIR}"/${P}-gcc-4.4.patch #269240 - epatch "${FILESDIR}"/reiser4progs_1.0.7-6.diff - printf '#!/bin/sh\ntrue\n' > run-ldconfig -} - -src_compile() { - econf \ - $(use_enable static full-static) \ - $(use_enable static mkfs-static) \ - $(use_enable static fsck-static) \ - $(use_enable static debugfs-static) \ - $(use_enable static measurefs-static) \ - $(use_enable static cpfs-static) \ - $(use_enable static resizefs-static) \ - $(use_enable debug) \ - $(use_with readline) \ - --enable-libminimal \ - --sbindir=/sbin \ - || die "configure failed" - emake || die "make failed" -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS BUGS CREDITS ChangeLog NEWS README THANKS TODO - - # move shared libs to / - dodir /$(get_libdir) - mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)/ || die - gen_usr_ldscript libreiser4-minimal.so libreiser4.so librepair.so -} diff --git a/sys-fs/reiser4progs/reiser4progs-1.0.9.ebuild b/sys-fs/reiser4progs/reiser4progs-1.0.9.ebuild new file mode 100644 index 00000000..b2bfdf9f --- /dev/null +++ b/sys-fs/reiser4progs/reiser4progs-1.0.9.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/reiser4progs/reiser4progs-1.0.8.ebuild,v 1.1 2014/03/13 22:38:34 vapier Exp $ + +EAPI="4" + +inherit multilib eutils toolchain-funcs + +DESCRIPTION="reiser4progs: mkfs, fsck, etc..." +HOMEPAGE="https://sourceforge.net/projects/reiser4/" +SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86" +IUSE="debug readline static static-libs" + +LIB_DEPEND="~sys-libs/libaal-1.0.6[static-libs(+)] + readline? ( sys-libs/readline[static-libs(+)] )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + static-libs? ( ~sys-libs/libaal-1.0.6[static-libs(+)] )" +DEPEND="${RDEPEND} + static? ( ${LIB_DEPEND} )" + +src_prepare() { + printf '#!/bin/sh\ntrue\n' > run-ldconfig + # Delete hardcoded link/compile flags. + sed -i -r \ + -e '/CFLAGS=/s: -static":":' \ + -e '/CFLAGS/s: (-O[123s]|-g)\>::g' \ + configure || die + epatch "${FILESDIR}"/${PN}-1.0.7-readline-6.3.patch #504472 + epatch "${FILESDIR}"/reiser4progs_1.0.7-6.diff +} + +src_configure() { + econf \ + $(use_enable static full-static) \ + $(use_enable static-libs static) \ + $(use_enable debug) \ + $(use_with readline) \ + --disable-Werror \ + --enable-libminimal \ + --sbindir=/sbin +} + +src_install() { + default + gen_usr_ldscript -a reiser4{,-minimal} repair +}