Add workaround for TestLinking in display/dict_test.go.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xFDE8EF85AE5719A3

4 files changed, 23 insertions, 105 deletions

diff --git a/dev-go/go-text/ChangeLog b/dev-go/go-text/ChangeLog
index 9e88f09086bc..8dc60fcbab38 100644
--- a/dev-go/go-text/ChangeLog
+++ b/dev-go/go-text/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-go/go-text
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-text/ChangeLog,v 1.5 2015/05/21 06:57:23 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-text/ChangeLog,v 1.6 2015/05/24 08:19:30 zmedico Exp $
+
+  24 May 2015; Zac Medico <zmedico@gentoo.org> go-text-1.4.2_p20150506.ebuild,
+  go-text-9999.ebuild:
+  Add workaround for TestLinking in display/dict_test.go.
 
   21 May 2015; Zac Medico <zmedico@gentoo.org> go-text-1.4.2_p20150506.ebuild:
   Add ~amd64 keyword.
diff --git a/dev-go/go-text/Manifest b/dev-go/go-text/Manifest
index ba2dd0681fa0..b846623d4776 100644
--- a/dev-go/go-text/Manifest
+++ b/dev-go/go-text/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA256
 
 DIST go-text-1.4.2_p20150506.tar.gz 3711464 SHA256 807391d9a71534abdcae0a04c585be2e1e08ce2f04a5eaf5c1284f003f97ec89 SHA512 da91210954c2ff925ff0e3bc1c0c1b3e0267c949ae81f40124eb46dd77349fbe7b27397470949efb84657cece22427a95bad6c22bb82d0ff6a69236106900280 WHIRLPOOL d924086b1400d9557e67cc11b710946660fa2b54bdf18618ea6c79b0b0e16bcd3c50afcb8fe93d00510a766bfae2f6b298d88967e79e42037011ec8cf034c7e1
-EBUILD go-text-1.4.2_p20150506.ebuild 4329 SHA256 cfe7075d8447452e5af32235b9d3207e43e9bb101032f4aa193d1eb6e97f34b0 SHA512 29fa06c8ab0ddb3b898142d779a91c9d86a8a8b322493094c15f91451cc4d53f04969954e1e2b69d584775e5ae79124d8ac3f4df40c0574133f27c6f2998740a WHIRLPOOL d742576bfc063d117d13786902a1549bb5eedad71e2dce6f4b7bbfcfc6044806788388c5f10165f8804ad7835b5cf2b7830698b6b0a67a26fd511509c89577d5
-EBUILD go-text-9999.ebuild 4113 SHA256 3895d5259fbecc029b7b5b349dfefcb411f3819e08a8acac067cd4200259507a SHA512 acca59486acc2a5a46a08837e254c87f0cd7e8177d5a2803afe14606a507e0dc2355a5ea548656d91119e854e538a0cb6403fa008c09ea0951a4140123bf4e9a WHIRLPOOL a55908f3f348dfdb9b719b75726d51b8f4ae8959fa9f79e9bf9c01abfa1536f2e5d3d270990e220385fc4a3cc10e4c57f905930fd43edc5f1b3178358975efe5
-MISC ChangeLog 796 SHA256 0eb51214d54fceb958453fc2cc431b7b6d2d0c70af0cf65c77d384ebb8b9f1a6 SHA512 4d2b7b13dd1668e2cbb3c9a92fe98cedc7cf2281f7e958511a0b226d1674db3d239ea81bdf710715781ad870d4b9665bdd570f97e203dd2369003d825bae1017 WHIRLPOOL fd9b4f145b35a3b45b152cb31e445a67531e86aa60db3f9a75a5dd132a842d42ab10c79ec60f914f04a7cf5bcf8a0959219b9d7b2dea778d5dc26ea554751d09
+EBUILD go-text-1.4.2_p20150506.ebuild 1525 SHA256 62559190aecc17f5fa85e42b0963f5520ca85ae5c5a5aac7ccb767fd95bf05d9 SHA512 58e1d01f8893fca22b7f3e35e566588fa9364eb43370c0bfed948d47bf4386a743da494d0e80dc7badd10d50b15709dfea6ccde41a82aec5df785e6f0ef4a29b WHIRLPOOL 9db760bd90c42910e2a99e300385cf3c235754fd9f2bf61ac06ce512e2f2517ca73da584df0af92715a9d8b0d22ec99abf7381e54ab056390336a391d7a80188
+EBUILD go-text-9999.ebuild 1309 SHA256 cc7ddf5cc0c5c9691c026a3b5b541d8f571bb118d28f6857272af43bbd74e53a SHA512 777faaee0b97d8d2e5362ed17093a93f46e303df9b11f2954189f1e70cc13013c7005c2e77be7bdf8a362320f9e9e99ab49ffa396d7121eae1c50b0642cb4e53 WHIRLPOOL 5f554fb550025ca536266fb47867e187126fb9243817194bcbec49577f4e87da46e780c4af041cd93a44fd13e4463551d16c69c2bb2903f16d141e54661c20be
+MISC ChangeLog 957 SHA256 02a21540212c07602af34ee57738f60862fcd47d296c4249fa456141cd01263d SHA512 b8f1919cc464700366c373810914a037c16a1e900de123668a36975bb3dee8d2f97f71da10cb269c6caa34f5cccd687bf5ce83ae5a870109ed62a5ce793b48e7 WHIRLPOOL f9c3e355a01de70a7607e16b4f9c2def96cfea06ec239482fc13824100a7d6042fb1c6fac2c7b1d5eb835130abc43bc80f004f1cec1503508076110608fcd0e9
 MISC metadata.xml 208 SHA256 67f4cd233dc8d6d341b8da89aef2654cae64f7e3b62fbcdd3a35e6e30e898e36 SHA512 5213f6c100db04c6bbbf73b4e52042caf1744aa805af76053f5ecaf5f921ffdd35c41507b492da65c6071f1699472db6c9334dcd5bb7da752dca8efe7e1c7aa4 WHIRLPOOL a43dc0ecd7f37ba8cf4d510a1195338816b6193e5c5517c8e005662a06d7fb62c725a3c2981474a872cba628c268de1bea0fb67a31ae1842a252c0fdc723eb4d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVdgdQACgkQ/ejvha5XGaMTFgCg7/gLKy+r3PJxtxspzyliEQxi
-2UoAoOZH3nnKalZ3/kDx0nIDGrC2d5ik
-=RPBO
+iEYEAREIAAYFAlVhiZMACgkQ/ejvha5XGaMkpwCfercXCJuvNV7WUqEBo210yxJ2
+1q0AnAzRVAbSgTw0DSPXEW3mkKAEvAi7
+=5NBy
 -----END PGP SIGNATURE-----
diff --git a/dev-go/go-text/go-text-1.4.2_p20150506.ebuild b/dev-go/go-text/go-text-1.4.2_p20150506.ebuild
index 7b3a2822eca9..8945fc3c0220 100644
--- a/dev-go/go-text/go-text-1.4.2_p20150506.ebuild
+++ b/dev-go/go-text/go-text-1.4.2_p20150506.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-text/go-text-1.4.2_p20150506.ebuild,v 1.3 2015/05/21 06:57:23 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-text/go-text-1.4.2_p20150506.ebuild,v 1.4 2015/05/24 08:19:30 zmedico Exp $
 
 EAPI=5
 
@@ -36,55 +36,12 @@ src_compile() {
 }
 
 src_test() {
+	# Create go symlink for TestLinking in display/dict_test.go
+	mkdir -p "${GOROOT}/bin"
+	ln -s /usr/bin/go  "${GOROOT}/bin/go" || die
+
 	GOROOT="${GOROOT}" GOPATH=${WORKDIR} \
-		go test -run "^("$(
-			echo -n 'Example(|_build|CanonType|Collator_Strings|Compacter|'
-			echo -n 'Compose|DecodeWindows1252|Dictionary|Gen_build|'
-			echo -n 'Gen_lookup|If|In|Iter|_lookup|Map|Matcher|Namer|Parent|'
-			echo -n 'ParseAcceptLanguage|Parse_errors|Region_TLD|Remove|'
-			echo -n 'RemoveFunc|Tag_Base|Tag_ComprehensibleTo|Tag_Region|'
-			echo -n 'Tags|Tag_Script|Tag_values|Transformer_fold|'
-			echo -n 'Transformer_narrow|Transformer_widen|UTF8Validator)|'
-			echo -n 'Test(AcceptMinSize|AddLikelySubtags|Ambiguous|Append|'
-			echo -n 'AppendNext|AppendString|AttrKey|Base|Basics|BestMatch|'
-			echo -n 'Big5CircumflexAndMacron|BOMOverride|Bytes|Bytes|'
-			echo -n 'BytesAllocation|Canonicalize|CaseMappings|'
-			echo -n 'CaseProperties|CCC|Chain|ColElem|ColElem|Compare|'
-			echo -n 'CompareWeights|Compose1|Compose2|Compose3|Composition|'
-			echo -n 'Contains|Context|Contract|ConvertLarge|Coverage|'
-			echo -n 'Currency|DecomposeSegment|DecomposeToLastBoundary|'
-			echo -n 'Decomposition|DeepCopy|Discard|DoNorm|Enclosing|'
-			echo -n 'EncodeInvalidUTF8|EncodeM49|EntryLess|EntrySort|'
-			echo -n 'Equality|Errors|Expand|Files|Filter|FindField|'
-			echo -n 'FindKeyAndType|FirstBoundary|FixCase|Flush|Fold|'
-			echo -n 'FoldSingleRunes|GenColElems|GenerateTrie|GenIdxSort|'
-			echo -n 'GenStates|Get|GetColElems|GetScriptID|Getters|'
-			echo -n 'Grandfathered|Group|Implicit|In|Index|Index|Insert|'
-			echo -n 'InsertAfter|InsertBefore|IsCountry|IsGroup|IsNormal|'
-			echo -n 'IsNormalString|IsPrivateUse|IsRoot|Iter|IterNext|'
-			echo -n 'IterSegmentation|Key|Key|KeyFromElems|LangID|Language|'
-			echo -n 'LastBoundary|LookupContraction|LookupContraction|'
-			echo -n 'LookupContraction|LookupTrie|MakeSlice|MakeString|Map|'
-			echo -n 'MapAlloc|Mapping|MatchLang|Merge|Minimize|Narrow|'
-			echo -n 'NarrowSingleRunes|NewCoverage|NextIndexed|NextWeight|'
-			echo -n 'NonDigits|NonRepertoire|Nop|NotIn|Numeric|'
-			echo -n 'NumericAppendNext|NumericCompare|NumericOverflow|'
-			echo -n 'NumericWeighterAlloc|OffsetSort|Options|Parent|'
-			echo -n 'ParentDistance|Parse|ParseAcceptLanguage|ParseBase|'
-			echo -n 'ParseCurrency|ParseDraft|ParseExtensions|ParseRegion|'
-			echo -n 'ParseScript|ParseTag|Path|PlaceHolder|Predicate|'
-			echo -n 'PrintContractionTrieSet|ProcessWeights|QuickSpan|'
-			echo -n 'Reader|Reader|Region|Region|RegionCanonicalize|'
-			echo -n 'RegionDeprecation|RegionDistance|RegionID|RegionISO3|'
-			echo -n 'RegionM49|RegionTLD|RegionType|Remove|Remove|'
-			echo -n 'RemoveAlloc|RemoveFunc|Replacement|RuleProcessor|'
-			echo -n 'Scan|Script|Script|Search|SelectAnyOf|SelectOnePerGroup|'
-			echo -n 'Self|SetTypeForKey|ShortBuffersAndOverflow|Simplify|'
-			echo -n 'Sort|String|String|StringAllocation|Supported|Supported|'
-			echo -n 'TagSize|Transform|TransformNorm|TypeForKey|Update|'
-			echo -n 'UpdateTertiary|UTF16|UTF8Validator|Widen|'
-			echo -n 'WidenSingleRunes|WordBreaks|Writer))$') \
-			-x -v ${GO_PN}/... || die $?
+		go test -x -v ${GO_PN}/... || die $?
 }
 
 src_install() {
diff --git a/dev-go/go-text/go-text-9999.ebuild b/dev-go/go-text/go-text-9999.ebuild
index d1c78b21de9c..312b2ab1b981 100644
--- a/dev-go/go-text/go-text-9999.ebuild
+++ b/dev-go/go-text/go-text-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-text/go-text-9999.ebuild,v 1.3 2015/05/21 06:39:07 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-text/go-text-9999.ebuild,v 1.4 2015/05/24 08:19:30 zmedico Exp $
 
 EAPI=5
 inherit git-r3
@@ -29,55 +29,12 @@ src_compile() {
 }
 
 src_test() {
+	# Create go symlink for TestLinking in display/dict_test.go
+	mkdir -p "${GOROOT}/bin"
+	ln -s /usr/bin/go  "${GOROOT}/bin/go" || die
+
 	GOROOT="${GOROOT}" GOPATH=${WORKDIR} \
-		go test -run "^("$(
-			echo -n 'Example(|_build|CanonType|Collator_Strings|Compacter|'
-			echo -n 'Compose|DecodeWindows1252|Dictionary|Gen_build|'
-			echo -n 'Gen_lookup|If|In|Iter|_lookup|Map|Matcher|Namer|Parent|'
-			echo -n 'ParseAcceptLanguage|Parse_errors|Region_TLD|Remove|'
-			echo -n 'RemoveFunc|Tag_Base|Tag_ComprehensibleTo|Tag_Region|'
-			echo -n 'Tags|Tag_Script|Tag_values|Transformer_fold|'
-			echo -n 'Transformer_narrow|Transformer_widen|UTF8Validator)|'
-			echo -n 'Test(AcceptMinSize|AddLikelySubtags|Ambiguous|Append|'
-			echo -n 'AppendNext|AppendString|AttrKey|Base|Basics|BestMatch|'
-			echo -n 'Big5CircumflexAndMacron|BOMOverride|Bytes|Bytes|'
-			echo -n 'BytesAllocation|Canonicalize|CaseMappings|'
-			echo -n 'CaseProperties|CCC|Chain|ColElem|ColElem|Compare|'
-			echo -n 'CompareWeights|Compose1|Compose2|Compose3|Composition|'
-			echo -n 'Contains|Context|Contract|ConvertLarge|Coverage|'
-			echo -n 'Currency|DecomposeSegment|DecomposeToLastBoundary|'
-			echo -n 'Decomposition|DeepCopy|Discard|DoNorm|Enclosing|'
-			echo -n 'EncodeInvalidUTF8|EncodeM49|EntryLess|EntrySort|'
-			echo -n 'Equality|Errors|Expand|Files|Filter|FindField|'
-			echo -n 'FindKeyAndType|FirstBoundary|FixCase|Flush|Fold|'
-			echo -n 'FoldSingleRunes|GenColElems|GenerateTrie|GenIdxSort|'
-			echo -n 'GenStates|Get|GetColElems|GetScriptID|Getters|'
-			echo -n 'Grandfathered|Group|Implicit|In|Index|Index|Insert|'
-			echo -n 'InsertAfter|InsertBefore|IsCountry|IsGroup|IsNormal|'
-			echo -n 'IsNormalString|IsPrivateUse|IsRoot|Iter|IterNext|'
-			echo -n 'IterSegmentation|Key|Key|KeyFromElems|LangID|Language|'
-			echo -n 'LastBoundary|LookupContraction|LookupContraction|'
-			echo -n 'LookupContraction|LookupTrie|MakeSlice|MakeString|Map|'
-			echo -n 'MapAlloc|Mapping|MatchLang|Merge|Minimize|Narrow|'
-			echo -n 'NarrowSingleRunes|NewCoverage|NextIndexed|NextWeight|'
-			echo -n 'NonDigits|NonRepertoire|Nop|NotIn|Numeric|'
-			echo -n 'NumericAppendNext|NumericCompare|NumericOverflow|'
-			echo -n 'NumericWeighterAlloc|OffsetSort|Options|Parent|'
-			echo -n 'ParentDistance|Parse|ParseAcceptLanguage|ParseBase|'
-			echo -n 'ParseCurrency|ParseDraft|ParseExtensions|ParseRegion|'
-			echo -n 'ParseScript|ParseTag|Path|PlaceHolder|Predicate|'
-			echo -n 'PrintContractionTrieSet|ProcessWeights|QuickSpan|'
-			echo -n 'Reader|Reader|Region|Region|RegionCanonicalize|'
-			echo -n 'RegionDeprecation|RegionDistance|RegionID|RegionISO3|'
-			echo -n 'RegionM49|RegionTLD|RegionType|Remove|Remove|'
-			echo -n 'RemoveAlloc|RemoveFunc|Replacement|RuleProcessor|'
-			echo -n 'Scan|Script|Script|Search|SelectAnyOf|SelectOnePerGroup|'
-			echo -n 'Self|SetTypeForKey|ShortBuffersAndOverflow|Simplify|'
-			echo -n 'Sort|String|String|StringAllocation|Supported|Supported|'
-			echo -n 'TagSize|Transform|TransformNorm|TypeForKey|Update|'
-			echo -n 'UpdateTertiary|UTF16|UTF8Validator|Widen|'
-			echo -n 'WidenSingleRunes|WordBreaks|Writer))$') \
-			-x -v ${GO_PN}/... || die $?
+		go test -x -v ${GO_PN}/... || die $?
 }
 
 src_install() {