[gentoo-commits] gentoo-x86 commit in sys-fs/e2fsprogs: e2fsprogs-1.42.10.ebuild ChangeLog

["Fabian Groffen (grobian)" <grobian@gentoo.org>]

grobian     14/07/06 17:08:35

  Modified:             e2fsprogs-1.42.10.ebuild ChangeLog
  Log:
  Update patch for FreeMiNT by Alan Hourihane, bug #498412, drop darwin keywords since this is broken now, drop old stuff to cleanup
  
  (Portage version: 2.2.10.1-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)

Revision  Changes    Path
1.3                  sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild?r1=1.2&r2=1.3

Index: e2fsprogs-1.42.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- e2fsprogs-1.42.10.ebuild	29 May 2014 02:38:52 -0000	1.2
+++ e2fsprogs-1.42.10.ebuild	6 Jul 2014 17:08:35 -0000	1.3
@@ -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.2 2014/05/29 02:38:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.10.ebuild,v 1.3 2014/07/06 17:08:35 grobian Exp $
 
 EAPI=4
 
@@ -13,11 +13,12 @@
 
 DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz"
+SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
+	https://498412.bugs.gentoo.org/attachment.cgi?id=368058 -> ${PN}-1.42.9-mint-r1.patch"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~m68k-mint"
 IUSE="nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
@@ -41,11 +42,9 @@
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.41.8-makefile.patch
 	epatch "${FILESDIR}"/${PN}-1.40-fbsd.patch
-	epatch "${FILESDIR}"/${PN}-1.41.12-darwin-makefile.patch
 	epatch "${FILESDIR}"/${P}-e2fsck-fix-makefile-dependency.patch
 	if [[ ${CHOST} == *-mint* ]] ; then
-		epatch "${FILESDIR}"/${PN}-1.41-mint.patch
-		epatch "${FILESDIR}"/${PN}-1.41.12-mint-blkid.patch
+		epatch "${DISTDIR}"/${PN}-1.42.9-mint-r1.patch
 	fi
 	# blargh ... trick e2fsprogs into using e2fsprogs-libs
 	rm -rf doc
@@ -69,20 +68,11 @@
 	# needs open64() prototypes and friends
 	append-cppflags -D_GNU_SOURCE
 
-	# We want to use the "bsd" libraries while building on Darwin, but while
-	# building on other Gentoo/*BSD we prefer elf-naming scheme.
-	local libtype
-	case ${CHOST} in
-		*-darwin*) libtype=--enable-bsd-shlibs  ;;
-		*-mint*)   libtype=                     ;;
-		*)         libtype=--enable-elf-shlibs  ;;
-	esac
-
 	ac_cv_path_LDCONFIG=: \
 	econf \
 		--with-root-prefix="${EPREFIX}/" \
 		--enable-symlink-install \
-		${libtype} \
+		$(tc-is-static-only || echo --enable-elf-shlibs) \
 		$(tc-has-tls || echo --disable-tls) \
 		--without-included-gettext \
 		$(use_enable nls) \



1.277                sys-fs/e2fsprogs/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.277&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?rev=1.277&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/e2fsprogs/ChangeLog?r1=1.276&r2=1.277

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- ChangeLog	29 May 2014 02:38:52 -0000	1.276
+++ ChangeLog	6 Jul 2014 17:08:35 -0000	1.277
@@ -1,6 +1,11 @@
 # 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.276 2014/05/29 02:38:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.277 2014/07/06 17:08:35 grobian Exp $
+
+  06 Jul 2014; Fabian Groffen <grobian@gentoo.org> e2fsprogs-1.42.10.ebuild,
+  e2fsprogs-1.42.9.ebuild:
+  Update patch for FreeMiNT by Alan Hourihane, bug #498412, drop darwin keywords
+  since this is broken now, drop old stuff to cleanup
 
   29 May 2014; Patrick Lauer <patrick@gentoo.org>
   +files/e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch,