Bump the patch
Package-Manager: portage-2.2.0_alpha188 RepoMan-Options: --force
This commit is contained in:
Mario Fetka
parent
fbdb802d9c
commit
b58d6be4ec
|
|
@ -1,7 +1,15 @@
|
|||
# ChangeLog for sys-fs/xfsprogs
|
||||
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
|
||||
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: $
|
||||
|
||||
*xfsprogs-3.1.11 (31 Oct 2013)
|
||||
|
||||
31 Oct 2013; Mario Fetka <mario.fetka@gmail.com>
|
||||
+files/xfsprogs-3.1.10-sharedlibs.patch, +xfsprogs-3.1.11.ebuild,
|
||||
-files/xfsprogs-3.1.1-sharedlibs.patch, -files/xfsprogs-3.1.8-readline.patch,
|
||||
-xfsprogs-3.1.8.ebuild:
|
||||
Bump the patch
|
||||
|
||||
*xfsprogs-3.1.8 (28 Nov 2012)
|
||||
|
||||
28 Nov 2012; Mario Fetka <mario.fetka@gmail.com>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
AUX xfsprogs-3.1.1-sharedlibs.patch 3196 SHA256 61de2caa3c25dafaa2b7347804dfd3ed171a38d6b16ffeda7028b74b46d789e5 SHA512 056856d5ec57fcab52f3a89dafc85fb8d4545dec83a882672ff1552c44e8ea59ba09e9bf539f8f0f26e55f8f861c5957181f2a2500bcb9aedeeaf71447ee1b92 WHIRLPOOL 6ef46f3dbbc34c362d4ba358600be6c78ad7a2dc88db80e03112503a20179dc778b3ccda30cf14acdc18126b31cff13785858f65ebf73658047e38be57298237
|
||||
AUX xfsprogs-3.1.8-readline.patch 918 SHA256 8e2bbe1c9541893df8405ec603181f464088ef44dd7c0257dd2eb919cb8237ef SHA512 9dd9b9dcd603c095fa0da501f08fd4dc52d31e2edb100cac0c074c05508e04dd92a13ca4bc053067a0c53c661d1c433910266c9463f8999734d73d1861cb0c01 WHIRLPOOL 275c44346ff2ddbd08d1364ea5c91d51dd1c127c4583f1ad5ddae05aa8801b9496c204b24bf879cd828a7f0fef6ca4cb3cf9bb129aa95e0665a6ab3a0a3007d7
|
||||
AUX xfsprogs-3.1.10-sharedlibs.patch 3196 SHA256 1f43e032cb05286c14eed7afcbd91aa8071f0d6d5a88195910264df3529a6992 SHA512 34a0084b981923ebdc22b425d73663c18aa253a64a2f739d177ef09f21a040c18595341f3fb714221146dba5a3f6fac1add1d385099f4eb5f2a0fea6725e9181 WHIRLPOOL 7ef85484c992b20397335af85fdf5b7e9e4169c8c19aafe6782aa366971e71dc6fa27b934a5d0fc7f1887a7c557b4425872aae373944f379c82f0e1d295cba92
|
||||
AUX xfsprogs_3.1.7-1drbl.patch 501 SHA256 f8256ff0499556830ba5c2ae3bec58a1434c075b59efbd0a1fe4275f70d652e7 SHA512 d78a9d81850996ccb812ebb13663e5579742ac64e406b6777b2c588a3db8cf6d1ae0ba5445808bc7546f47edfffbb8095c1c2df400186a8408bda4f7ca2bc240 WHIRLPOOL 9431760beaca2a597ed1adf4b3755163fbcc763a951afff5e5bfc9fa4f5852e7c2b35d30c15315385f71643b7db974a232d1f200d800f91a300f6b08c0baccd4
|
||||
DIST xfsprogs-3.1.8.tar.gz 1399333 SHA256 74409e2e3748074999df25c00f722621659a0bd3607e677f0bcc4373b8c93eab SHA512 55f325e2284a88f21f05b8a836b654de16109e509315b9f443888331e7f63bdf4bbd749643d7879c8007b95b98c7ff0a6574bb1e8cf809abe481b7584466524a WHIRLPOOL d637b01c68e3673a2b70f271068c63ad83bb18cd47252ee190204fcb94b103c513612f7111346c8eb6194d4043a236cc6ab5c1b94e4d4175ed7f34231e759601
|
||||
EBUILD xfsprogs-3.1.8.ebuild 2838 SHA256 06b63c903f3d91e572df2dafefc7793398f67f31413c444a4e4bca8294ea84bb SHA512 13044a6a8de7f5f9842dcfff4efb91365f6d915318655d218718ad5b8047a61ed47c82b4e36b86e7d6108dfcd4859a3f11592a83cb8d77dd8f1aed327a2672d3 WHIRLPOOL 05c9e1646e9be841693e0ac1d0af424f3145e82ab63ba7bac21c160dbaa8853c1991b40dc7e121be9a0acc49acb592826314549d853be1c2f35b67f7096152cd
|
||||
MISC ChangeLog 385 SHA256 328009277a4f318834d60fbc7ac23f21f4550d74bd12bfa20e3561dea57ceb20 SHA512 9b8239351cdde48a5bd74998fd3cdc57c6198b915eefe4e91d5e4da556d643f69ca6dde7a6c425015aadc6062839594aa6337a448231e7363ee4a73a2f9eb9d2 WHIRLPOOL fa9154ad998579ef1ee1f5a3e48743ec9f8f368633278c74fe0a901927e4c8bcab0f49f0dfdd1b8b32e9fd5fc9a91bce11bc4f7783321073fa341d4d37977cc6
|
||||
DIST xfsprogs-3.1.11.tar.gz 1399833 SHA256 adf4980177b5c890c1ca86b9c0e3e4d69a3f95bfc01746844280c2393cf4d6be SHA512 6de16f0904709e53e6ceea8239e23b7e109375733fd712fd97bfbbf74ec7f1376147e61d1fbe498f1d5be2148bf8ca233c0577d5b88e9201bfd4bb87e696c28a WHIRLPOOL d52f177d172940e46c813575459917d73042739629f83537932eff38b28a524956484ad6ebbbd2d5d698f1a4b60c1a0f127ca1dd22bba86dcd74c5b94bf51962
|
||||
EBUILD xfsprogs-3.1.11.ebuild 2706 SHA256 7167b2e90b020984670ee1b89f3464ffb4f11ffd5ecd8747c21f895ac29ec611 SHA512 306119fa8b718e871f26687a0788a2b2f57896d84c1e455b9e627cf9fb9e8084a15fa23be4b2ac7055c50a7853df185b481ecc5791e3e2f938a1a09ea00e7225 WHIRLPOOL 2df6a9a916868bcc10c9d053207ffaad3cb2f9e9004444feb56c74369ff3f4579f6602b017f28796fb5e6a82723dc90c907a9c72fb4bc19fbc1c1c134b4c0003
|
||||
MISC ChangeLog 660 SHA256 feb16ca2941d48b6b30965b51f3489e0e16a80ccb026268b1404f9f689bc89c0 SHA512 38cea3f16219c1cf8b795fb90e0d47750c69b7e90b4c17c55941e42cba7b431352de73e270c1e9deafe9f259ccf9ed58fa727a8761df0ae358a190caae78b0b8 WHIRLPOOL e204ceb19cbabcb6913cb60bbcf013809791546262cc70b9c0baddaebb4d2e9f83ae30aefcae01a2f6d2702b8bc8ef6f16a02e73ec73921796d4544ce689dd19
|
||||
MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
|
||||
|
|
|
|||
|
|
@ -87,10 +87,10 @@ ripped from PLD Linux
|
|||
+_INSTALL_LTLIB = set -e; \
|
||||
cd $(TOPDIR)/$(LIBNAME)/.libs; \
|
||||
- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
|
||||
- ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
|
||||
- ../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
|
||||
- ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_ROOT_LIB_DIR)
|
||||
+ ../$(INSTALL) -m 755 -d $(1); \
|
||||
+ ../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(1); \
|
||||
+ ../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(1); \
|
||||
+ ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(1)
|
||||
+INSTALL_LTLIB_ROOT = $(call _INSTALL_LTLIB,$(PKG_ROOT_LIB_DIR))
|
||||
+INSTALL_LTLIB = $(call _INSTALL_LTLIB,$(PKG_LIB_DIR))
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
From 52548f087e9c5ff05c9f43c859114cf2066f133b Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Sat, 25 Aug 2012 19:06:28 -0400
|
||||
Subject: [PATCH] libxcmd: link against readline
|
||||
|
||||
This library uses readline funcs (the input.c file), so we need to link
|
||||
this shared library against it.
|
||||
|
||||
URL: https://bugs.gentoo.org/432644
|
||||
Reported-by: David Badia <dbadia@gmail.com>
|
||||
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
||||
---
|
||||
libxcmd/Makefile | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/libxcmd/Makefile b/libxcmd/Makefile
|
||||
index b3544f4..ce082a5 100644
|
||||
--- a/libxcmd/Makefile
|
||||
+++ b/libxcmd/Makefile
|
||||
@@ -22,10 +22,12 @@ endif
|
||||
|
||||
ifeq ($(ENABLE_READLINE),yes)
|
||||
LCFLAGS += -DENABLE_READLINE
|
||||
+LTLIBS += $(LIBREADLINE) $(LIBTERMCAP)
|
||||
endif
|
||||
|
||||
ifeq ($(ENABLE_EDITLINE),yes)
|
||||
LCFLAGS += -DENABLE_EDITLINE
|
||||
+LTLIBS += $(LIBEDITLINE) $(LIBTERMCAP)
|
||||
endif
|
||||
|
||||
default: ltdepend $(LTLIBRARY)
|
||||
--
|
||||
1.7.9.7
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.8.ebuild,v 1.9 2012/08/25 23:10:10 vapier Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.11.ebuild,v 1.1 2013/10/18 08:17:44 polynomial-c Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
|
|
@ -13,7 +13,7 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
|
|||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
|
||||
IUSE="libedit nls readline static static-libs"
|
||||
REQUIRED_USE="static? ( static-libs )"
|
||||
|
||||
|
|
@ -37,10 +37,10 @@ pkg_setup() {
|
|||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-3.1.1-sharedlibs.patch
|
||||
epatch "${FILESDIR}"/${PN}-3.1.8-readline.patch
|
||||
epatch "${FILESDIR}"/${PN}-3.1.10-sharedlibs.patch
|
||||
epatch "${FILESDIR}"/xfsprogs_3.1.7-1drbl.patch
|
||||
|
||||
|
||||
sed -i \
|
||||
-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
|
||||
include/builddefs.in || die
|
||||
|
|
@ -71,15 +71,6 @@ src_configure() {
|
|||
unset PLATFORM # if set in user env, this breaks configure
|
||||
|
||||
local myconf
|
||||
|
||||
if use readline ; then
|
||||
myconf="--enable-readline --disable-editline"
|
||||
elif use libedit ; then
|
||||
myconf="--disable-readline --enable-editline"
|
||||
else
|
||||
myconf="--disable-readline --disable-editline"
|
||||
fi
|
||||
|
||||
if use static || use static-libs ; then
|
||||
myconf+=" --enable-static"
|
||||
else
|
||||
|
|
@ -90,6 +81,8 @@ src_configure() {
|
|||
--bindir=/usr/bin \
|
||||
--libexecdir=/usr/$(get_libdir) \
|
||||
$(use_enable nls gettext) \
|
||||
$(use_enable readline) \
|
||||
$(usex readline --disable-editline $(use_enable libedit editline)) \
|
||||
${myconf}
|
||||
|
||||
MAKEOPTS+=" V=1"
|
||||
Loading…
Reference in New Issue