commit: d42f597d3c10895a6c62a35773c982bedad3754d Author: Aric Belsito <lluixhi <AT> gmail <DOT> com> AuthorDate: Mon Nov 21 21:02:55 2016 +0000 Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com> CommitDate: Mon Nov 21 21:02:55 2016 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=d42f597d
sys-apps/attr: Sync with tree. Remove r999 postfix sys-apps/attr/Manifest | 4 ++-- ...ttr-2.4.47-r999.ebuild => attr-2.4.47-r2.ebuild} | 17 ++++++++++------- ...def_cplusplus.patch => attr-2.4.47-cdecls.patch} | 21 ++++++++++++--------- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest index a5a4a01..c1cf482 100644 --- a/sys-apps/attr/Manifest +++ b/sys-apps/attr/Manifest @@ -1,5 +1,5 @@ -AUX attr-2.4.46-ifdef_cplusplus.patch 746 SHA256 5642592689dbbd7547514a9d76ae69adb81d81c205dc6c7671ea94c4ddd99641 SHA512 36a3fd04e006877cdb6c3185a12b3239f1cef307420f9df43074852cf9a3979976144df12a966323f32c298e6901b137b2d030e8dd04f9227016829453543b17 WHIRLPOOL 00ef7704488e1953fe833798c573cdf037f3eb16d4fbbc2ca92e818e2f52fb95f627cccf1f9093578602ee0ef8902374d1dd03062e1ee6d21873b48c97aa60ca +AUX attr-2.4.47-cdecls.patch 791 SHA256 420db639cef03e9255bc168b649dca28b857012058dab439f65c4c886bdb7e48 SHA512 9ea5f950a944ccfaab47ed1b5f361215053a9e0f49425e03d07a7654baed31a5f755c839140553472147bb71c0c245cbc6f94564dbd957f3b4d494f225fa55e2 WHIRLPOOL ca1b930a4e87028cd290be5b9a4a874a8da10f557188e168fbaf644fc2cf54a13fe5a6efd4d74908f5f2da3427e2090d62231fa0c1ed21143d9c4b7b7df20979 AUX attr-2.4.47-fix-missing-sys_types_h.patch 432 SHA256 769de24e3ec6fcb253ba89beed2223ef3919ee5c9bfc4672638054cf60e47761 SHA512 9d6c3885c88f1b67d862205ee447adf4254e816745f9ef02e33f2253503299bbd7f5f39ffe1a53d8e801dde9001efd45afacb2fdc8cd4f8d7923e62e3b7256ec WHIRLPOOL ba4a3c0fa58dbb330cca9c1e9582bdfc3a9d091dabdf9423328b3456e68146770e9098900554e0ff7b9aeef469ed09accbf102c48c510dfebb0bbc5fc5808264 DIST attr-2.4.47.src.tar.gz 343692 SHA256 25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859 SHA512 2a333f63655758298650cf8f89c175efdc0112dcc4013e8d023e2a9a69f177e4bcb1f1d10b6666d6f2027dca4dec0833d54749952ab153d28367e1a72e6e2831 WHIRLPOOL a012f7a0225e63d4d195fae7027e64c0c92edb039622bfdec611b2facbcde83eb5fc921ecfe95c50f54f7c9b518f57a0555dcedc148cc8ff6e73371668a40557 -EBUILD attr-2.4.47-r999.ebuild 1823 SHA256 615a22322c687e084f783c2874b3642b8a2f7258fa38fe81d2f05cb2c8dd21b1 SHA512 f801bc351e553b18e7d464634eaf82f9a08becea361a73cc56461c9e431fe6feed4d0fe305c3e647df1591fe66bbf0152d02ca776797f55966d4e9ce671d8662 WHIRLPOOL 9e48dbe7d1926fd0596f1e328161c9812a1c4310ced597b451b9f07ffd92749cf9bdc493876a6fc5c146ca3f88503d75b7365e636ecd132b20b5d396066a6e12 +EBUILD attr-2.4.47-r2.ebuild 1954 SHA256 e2269cc6613b7ec0d1c8d0a0e154051c80b683775ef6d1af75456487c44f01cd SHA512 b96cf8c00fc4fd7a4011815706c5073d9cf60f04d248e48aa3c741b7f393403800f8d08fc1bf2a9d84b1c27c49bb57767f363ae99aedf1baca1b6cc8c33ca204 WHIRLPOOL d943987107a4b9e3b393e198293e4686da810027602ddf9404bf3413f4e7a78673e2f2dd034900727b6cd73f5229bbb03f4dca37720d11539b7a814700a8ae33 MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8 diff --git a/sys-apps/attr/attr-2.4.47-r999.ebuild b/sys-apps/attr/attr-2.4.47-r2.ebuild similarity index 78% rename from sys-apps/attr/attr-2.4.47-r999.ebuild rename to sys-apps/attr/attr-2.4.47-r2.ebuild index 8a8d666..005f4fc 100644 --- a/sys-apps/attr/attr-2.4.47-r999.ebuild +++ b/sys-apps/attr/attr-2.4.47-r2.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI="4" -inherit eutils toolchain-funcs multilib-minimal +inherit eutils libtool toolchain-funcs multilib-minimal DESCRIPTION="Extended attributes tools" -HOMEPAGE="http://savannah.nongnu.org/projects/attr"; +HOMEPAGE="https://savannah.nongnu.org/projects/attr"; SRC_URI="mirror://nongnu/${PN}/${P}.src.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="nls static-libs" DEPEND="nls? ( sys-devel/gettext ) @@ -23,14 +23,17 @@ RDEPEND="abi_x86_32? ( )" src_prepare() { - epatch "${FILESDIR}"/${PN}-2.4.46-ifdef_cplusplus.patch + epatch "${FILESDIR}"/${P}-cdecls.patch epatch "${FILESDIR}"/${P}-fix-missing-sys_types_h.patch + sed -i \ -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ -e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \ include/builddefs.in \ || die strip-linguas -u po + elibtoolize #580792 + multilib_copy_sources # https://savannah.nongnu.org/bugs/index.php?39736 } @@ -61,7 +64,7 @@ multilib_src_install() { gen_usr_ldscript -a attr # the man-pages packages provides the man2 files # note: man-pages are installed by TOOL_SUBDIRS - rm -r "${ED}"/usr/share/man/man2 || die + rm -r "${ED}"/usr/share/man/man2 "${ED}"/usr/share/man/man5/attr.5 || die fi } diff --git a/sys-apps/attr/files/attr-2.4.46-ifdef_cplusplus.patch b/sys-apps/attr/files/attr-2.4.47-cdecls.patch similarity index 54% rename from sys-apps/attr/files/attr-2.4.46-ifdef_cplusplus.patch rename to sys-apps/attr/files/attr-2.4.47-cdecls.patch index 7b01afe..85a146f 100644 --- a/sys-apps/attr/files/attr-2.4.46-ifdef_cplusplus.patch +++ b/sys-apps/attr/files/attr-2.4.47-cdecls.patch @@ -1,24 +1,27 @@ -diff -Naur attr-2.4.46.orig/include/xattr.h attr-2.4.46/include/xattr.h ---- attr-2.4.46.orig/include/xattr.h 2014-01-21 22:14:56.418790180 +0000 -+++ attr-2.4.46/include/xattr.h 2014-01-21 22:14:19.626788123 +0000 -@@ -31,7 +31,11 @@ +diff -Naurw attr-2.4.47.orig/include/xattr.h attr-2.4.47/include/xattr.h +--- attr-2.4.47.orig/include/xattr.h 2015-08-22 14:26:31.167584051 +0700 ++++ attr-2.4.47/include/xattr.h 2015-08-22 14:32:25.714261283 +0700 +@@ -31,7 +31,12 @@ #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ -+#ifdef __cpluplus - __BEGIN_DECLS +-__BEGIN_DECLS ++#ifdef __cplusplus ++#define __THROW throw() ++extern "C" { +#else +#define __THROW +#endif extern int setxattr (const char *__path, const char *__name, const void *__value, size_t __size, int __flags) __THROW; -@@ -58,6 +62,8 @@ +@@ -58,6 +63,8 @@ extern int lremovexattr (const char *__path, const char *__name) __THROW; extern int fremovexattr (int __filedes, const char *__name) __THROW; -+#ifdef __cpluplus - __END_DECLS +-__END_DECLS ++#ifdef __cplusplus ++} +#endif #endif /* __XATTR_H__ */
