Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

synced sys-block/parted via auto-sync

  • Loading branch information...
commit 224fff5804b5e122c87277271da89e39cf8488a6 1 parent 6a043c3
@ahuemer ahuemer authored
View
3  sys-block/parted/Manifest
@@ -1,4 +1,5 @@
+AUX parted-2.3-git-version-gen.patch 1275 RMD160 8a0660c118ab584f6a91691318d0415f7a46daaa SHA1 7b9371299803afefdbe8d8beca0c7e3e0c1aa4ed SHA256 42cfd406e5508768987b916b46bcbc7e81ef8ed57f65428fc9a462439eba0896
DIST parted-2.3.tar.gz 2974168 RMD160 173dabc4c9fabc4246f0a74395a51fce2fb0b730 SHA1 9ef653c1f97c88b52d8e41f26ea3a8e3379f9cd6 SHA256 e81fa140805b5cd029ff6dda5cfa94d223e83ac182ebcae94f841d62ce468829
DIST parted-2.3.tar.xz 1434420 RMD160 69c35245f465fcb25329eb2ee72851968cf92719 SHA1 ae5795dac1228ff388e514848611673026aa1c76 SHA256 66a080cc7baaf0eb11cc8c2c25f8d89921358b799d92c139aa92716503924b69
-EBUILD parted-2.3-r1.ebuild 2087 RMD160 61d8d6c7fe4b3cfa726486eb27fe233766f551d5 SHA1 b229350a0006d075fe3de6a32d75be67b4ea1a16 SHA256 f5fb0353cbb3fc9136ac182f3322495dcc93f063cb9d083ae9cc155c30646770
+EBUILD parted-2.3-r1.ebuild 2148 RMD160 a07c7608b28af16e5aff544a10e250de4729ed14 SHA1 2c75170f2481b1f041400e56644cd74be896ff75 SHA256 a17e5bbca2f0120c6d35c21674d549ce9c343b80c5525ef64d71272199f3cec8
EBUILD parted-2.3.ebuild 2073 RMD160 d1b15cb94af831c8b355dec8020e278699d456b1 SHA1 81db271addb782c7786764a9ef7f59247c457f9e SHA256 5b6e7ce72ae92c1916ed212b5f9129dd34ffbb1e1f782a703c5f7815ea372972
View
39 sys-block/parted/files/parted-2.3-git-version-gen.patch
@@ -0,0 +1,39 @@
+http://bugs.gentoo.org/355045
+
+[PATCH] git-version-gen: skip "-dirty" check when appropriate
+
+* build-aux/git-version-gen: Don't run any git commands
+when the version comes from .tarball-version. Prior to this,
+we would run git update-index --refresh even from a just-unpacked
+tarball directory, and that could affect a .git/ directory in a
+parent of the build directory. Reported by Mike Frysinger.
+
+diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen
+index 68c7d64..686f703 100755
+--- a/build-aux/git-version-gen
++++ b/build-aux/git-version-gen
+@@ -124,13 +124,16 @@
+ # Change the first '-' to a '.', so version-comparing tools work properly.
+ # Remove the "g" in git describe's output string, to save a byte.
+ v=`echo "$v" | sed 's/-/./;s/\(.*\)-g/\1-/'`;
++ v_from_git=1
+ else
+ v=UNKNOWN
++ v_from_git=
+ fi
+
+ v=`echo "$v" |sed 's/^v//'`
+
+ # Don't declare a version "dirty" merely because a time stamp has changed.
++if test -n "$v_from_git"; then
+ git update-index --refresh > /dev/null 2>&1
+
+ dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty=
+@@ -142,6 +145,7 @@
+ *) v="$v-dirty" ;;
+ esac ;;
+ esac
++fi
+
+ # Omit the trailing newline, so that m4_esyscmd can use the result directly.
+ echo "$v" | tr -d "$nl"
View
4 sys-block/parted/parted-2.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-2.3-r1.ebuild,v 1.1 2011/01/29 05:45:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/parted/parted-2.3-r1.ebuild,v 1.2 2011/02/21 17:09:57 vapier Exp $
EAPI="3"
@@ -34,6 +34,8 @@ DEPEND="
"
multilib-native_src_prepare_internal() {
+ epatch "${FILESDIR}"/${P}-git-version-gen.patch #355045
+
# Remove tests known to FAIL instead of SKIP without OS/userland support
sed -i libparted/tests/Makefile.am \
-e 's|t3000-symlink.sh||g' || die "sed failed"
Please sign in to comment.
Something went wrong with that request. Please try again.