| 1 |
vapier 12/03/30 21:40:27 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: xfsprogs-3.1.7-r1.ebuild |
| 5 |
Log: |
| 6 |
Migrate to EAPI=4 and fix static-libs handling #410251 by Fernando V. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha95/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.142 sys-fs/xfsprogs/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/ChangeLog?rev=1.142&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/ChangeLog?rev=1.142&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/ChangeLog?r1=1.141&r2=1.142 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v |
| 20 |
retrieving revision 1.141 |
| 21 |
retrieving revision 1.142 |
| 22 |
diff -u -r1.141 -r1.142 |
| 23 |
--- ChangeLog 30 Mar 2012 17:06:50 -0000 1.141 |
| 24 |
+++ ChangeLog 30 Mar 2012 21:40:27 -0000 1.142 |
| 25 |
@@ -1,6 +1,11 @@ |
| 26 |
# ChangeLog for sys-fs/xfsprogs |
| 27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.141 2012/03/30 17:06:50 flameeyes Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/ChangeLog,v 1.142 2012/03/30 21:40:27 vapier Exp $ |
| 30 |
+ |
| 31 |
+*xfsprogs-3.1.7-r1 (30 Mar 2012) |
| 32 |
+ |
| 33 |
+ 30 Mar 2012; Mike Frysinger <vapier@g.o> +xfsprogs-3.1.7-r1.ebuild: |
| 34 |
+ Migrate to EAPI=4 and fix static-libs handling #410251 by Fernando V. |
| 35 |
|
| 36 |
30 Mar 2012; Diego E. Pettenò <flameeyes@g.o> xfsprogs-3.1.4.ebuild, |
| 37 |
xfsprogs-3.1.5.ebuild, xfsprogs-3.1.6.ebuild, xfsprogs-3.1.7.ebuild: |
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.1 sys-fs/xfsprogs/xfsprogs-3.1.7-r1.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.7-r1.ebuild?rev=1.1&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.7-r1.ebuild?rev=1.1&content-type=text/plain |
| 45 |
|
| 46 |
Index: xfsprogs-3.1.7-r1.ebuild |
| 47 |
=================================================================== |
| 48 |
# Copyright 1999-2012 Gentoo Foundation |
| 49 |
# Distributed under the terms of the GNU General Public License v2 |
| 50 |
# $Header: /var/cvsroot/gentoo-x86/sys-fs/xfsprogs/xfsprogs-3.1.7-r1.ebuild,v 1.1 2012/03/30 21:40:27 vapier Exp $ |
| 51 |
|
| 52 |
EAPI="4" |
| 53 |
|
| 54 |
inherit eutils toolchain-funcs multilib |
| 55 |
|
| 56 |
DESCRIPTION="xfs filesystem utilities" |
| 57 |
HOMEPAGE="http://oss.sgi.com/projects/xfs/" |
| 58 |
SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz |
| 59 |
ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/${P}.tar.gz" |
| 60 |
|
| 61 |
LICENSE="LGPL-2.1" |
| 62 |
SLOT="0" |
| 63 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" |
| 64 |
IUSE="libedit nls readline static static-libs" |
| 65 |
REQUIRED_USE="static? ( static-libs )" |
| 66 |
|
| 67 |
LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)] |
| 68 |
readline? ( sys-libs/readline[static-libs(+)] ) |
| 69 |
!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )" |
| 70 |
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) |
| 71 |
!<sys-fs/xfsdump-3" |
| 72 |
DEPEND="${RDEPEND} |
| 73 |
static? ( |
| 74 |
${LIB_DEPEND} |
| 75 |
readline? ( sys-libs/ncurses[static-libs] ) |
| 76 |
) |
| 77 |
nls? ( sys-devel/gettext )" |
| 78 |
|
| 79 |
pkg_setup() { |
| 80 |
if use readline && use libedit ; then |
| 81 |
ewarn "You have USE='readline libedit' but these are exclusive." |
| 82 |
ewarn "Defaulting to readline; please disable this USE flag if you want libedit." |
| 83 |
fi |
| 84 |
} |
| 85 |
|
| 86 |
src_prepare() { |
| 87 |
epatch "${FILESDIR}"/${PN}-3.1.1-sharedlibs.patch |
| 88 |
|
| 89 |
sed -i \ |
| 90 |
-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \ |
| 91 |
include/builddefs.in || die |
| 92 |
sed -i \ |
| 93 |
-e '1iLLDFLAGS = -static' \ |
| 94 |
{estimate,fsr}/Makefile || die |
| 95 |
sed -i \ |
| 96 |
-e "/LLDFLAGS/s:-static:$(use static && echo -all-static):" \ |
| 97 |
$(find -name Makefile) || die |
| 98 |
|
| 99 |
# libdisk has broken blkid conditional checking |
| 100 |
sed -i \ |
| 101 |
-e '/LIB_SUBDIRS/s:libdisk::' \ |
| 102 |
Makefile || die |
| 103 |
|
| 104 |
# TODO: write a patch for configure.in to use pkg-config for the uuid-part |
| 105 |
if use static && use readline ; then |
| 106 |
sed -i \ |
| 107 |
-e 's|-lreadline|\0 -lncurses|' \ |
| 108 |
-e 's|-lblkid|\0 -luuid|' \ |
| 109 |
configure || die |
| 110 |
fi |
| 111 |
} |
| 112 |
|
| 113 |
src_configure() { |
| 114 |
export DEBUG=-DNDEBUG |
| 115 |
export OPTIMIZER=${CFLAGS} |
| 116 |
unset PLATFORM # if set in user env, this breaks configure |
| 117 |
|
| 118 |
local myconf |
| 119 |
|
| 120 |
if use readline ; then |
| 121 |
myconf="--enable-readline --disable-editline" |
| 122 |
elif use libedit ; then |
| 123 |
myconf="--disable-readline --enable-editline" |
| 124 |
else |
| 125 |
myconf="--disable-readline --disable-editline" |
| 126 |
fi |
| 127 |
|
| 128 |
if use static || use static-libs ; then |
| 129 |
myconf="${myconf} --enable-static" |
| 130 |
else |
| 131 |
myconf="${myconf} --disable-static" |
| 132 |
fi |
| 133 |
|
| 134 |
econf \ |
| 135 |
--bindir=/usr/bin \ |
| 136 |
--libexecdir=/usr/$(get_libdir) \ |
| 137 |
$(use_enable nls gettext) \ |
| 138 |
${myconf} |
| 139 |
|
| 140 |
MAKEOPTS+=" V=1" |
| 141 |
} |
| 142 |
|
| 143 |
src_install() { |
| 144 |
emake DIST_ROOT="${ED}" install install-dev |
| 145 |
|
| 146 |
# handle is for xfsdump, the rest for xfsprogs |
| 147 |
gen_usr_ldscript -a xfs xlog |
| 148 |
# removing unnecessary .la files if not needed |
| 149 |
use static-libs || find "${ED}" -name '*.la' -delete |
| 150 |
} |
Archives