summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-08-05 09:19:10 +0000
committerMike Frysinger <vapier@gentoo.org>2014-08-05 09:19:10 +0000
commit4a62f57718675bddfce0b2003d549c589af10975 (patch)
tree13d2b6c678a6121ee570ec78991dfd5cadf28474 /sys-fs
parentVersion bump (diff)
downloadgentoo-2-4a62f57718675bddfce0b2003d549c589af10975.tar.gz
gentoo-2-4a62f57718675bddfce0b2003d549c589af10975.tar.bz2
gentoo-2-4a62f57718675bddfce0b2003d549c589af10975.zip
also update sed line in older ebuild #516978 by Nikoli
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/e2fsprogs/ChangeLog7
-rw-r--r--sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild6
2 files changed, 7 insertions, 6 deletions
diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index f23a7be4e6f5..7e2cb2d8a1e7 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,9 +1,10 @@
# ChangeLog for sys-fs/e2fsprogs
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.290 2014/08/05 09:01:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.291 2014/08/05 09:19:10 vapier Exp $
05 Aug 2014; Mike Frysinger <vapier@gentoo.org>
- +files/e2fsprogs-1.42.11-prototypes.patch, e2fsprogs-1.42.11.ebuild:
+ +files/e2fsprogs-1.42.11-prototypes.patch, e2fsprogs-1.42.10.ebuild,
+ e2fsprogs-1.42.11.ebuild:
Add fix from upstream and update libcom_err/libss sed line.
05 Aug 2014; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.42.10.ebuild,
@@ -23,7 +24,7 @@
20 Jul 2014; Lars Wendler <polynomial-c@gentoo.org> -e2fsprogs-1.42.9.ebuild,
+e2fsprogs-1.42.11.ebuild:
- Version bump. Removed old.
+ Version bump #517214. Removed old.
18 Jul 2014; Matt Turner <mattst88@gentoo.org> e2fsprogs-1.42.10.ebuild:
alpha stable, bug 516114.
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild
index 9dddd1047751..85b53b76b1de 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v 1.13 2014/08/05 07:47:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v 1.14 2014/08/05 09:19:10 vapier Exp $
EAPI=4
@@ -39,8 +39,8 @@ src_prepare() {
rm -rf doc
sed -i -r \
-e 's:@LIBINTL@:@LTLIBINTL@:' \
- -e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
- -e '/^DEPLIB(COM_ERR|SS)/s:=.*:=:' \
+ -e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
+ -e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
MCONFIG.in || die "muck libs" #122368
sed -i -r \
-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \