diff options
author | William Hubbs <williamh@gentoo.org> | 2014-07-06 21:24:30 +0000 |
---|---|---|
committer | William Hubbs <williamh@gentoo.org> | 2014-07-06 21:24:30 +0000 |
commit | a948d211a903547f1a93d87933d24b0cd03c85a3 (patch) | |
tree | 7ebacfd7b62fca1fc4ee0b1db0d3a43c811fcb5a /sys-apps | |
parent | Stable on amd64 and x86, wrt bug #516344 (diff) | |
download | historical-a948d211a903547f1a93d87933d24b0cd03c85a3.tar.gz historical-a948d211a903547f1a93d87933d24b0cd03c85a3.tar.bz2 historical-a948d211a903547f1a93d87933d24b0cd03c85a3.zip |
reinstate the separate inherit call for git-r3.
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x30C46538
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/gentoo-functions/ChangeLog | 5 | ||||
-rw-r--r-- | sys-apps/gentoo-functions/Manifest | 10 | ||||
-rw-r--r-- | sys-apps/gentoo-functions/gentoo-functions-9999.ebuild | 6 |
3 files changed, 12 insertions, 9 deletions
diff --git a/sys-apps/gentoo-functions/ChangeLog b/sys-apps/gentoo-functions/ChangeLog index 65746a20bee5..7a624e08aa3f 100644 --- a/sys-apps/gentoo-functions/ChangeLog +++ b/sys-apps/gentoo-functions/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-apps/gentoo-functions # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-functions/ChangeLog,v 1.15 2014/07/06 20:40:27 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-functions/ChangeLog,v 1.16 2014/07/06 21:24:10 williamh Exp $ + + 06 Jul 2014; William Hubbs <williamh@gentoo.org> gentoo-functions-9999.ebuild: + reinstate the separate inherit call for git-r3. 06 Jul 2014; William Hubbs <williamh@gentoo.org> metadata.xml: convert metadata indentations back to tabs as shown in skel.metadata.xml. diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest index e14153f8f93e..c308ee0573ba 100644 --- a/sys-apps/gentoo-functions/Manifest +++ b/sys-apps/gentoo-functions/Manifest @@ -9,13 +9,13 @@ EBUILD gentoo-functions-0.3.ebuild 888 SHA256 25ad3dc00cfd0bae53b145b562dc40a6b3 EBUILD gentoo-functions-0.4.ebuild 956 SHA256 51d791fa2d6c75248f0dd6ca0e8de1523d26973b07d5c4e965bc716963604a53 SHA512 7875cae0fd3edfeca741ac0c6b9363e7569fd77b1b95c7e8ac88b1b8175a953588e2bc127d13fb0aa20f8cfbf4ad5cfebdb5cf4a20e4875f814dc46bfc0898a7 WHIRLPOOL 68eddf99c7b2905893f0b06c4f73030f5c3ecaa0c40c1f6c450c18bef5e3901fb837e4579041ed0e5ead375540e02670ec51368f30b58de794301526ab4d3564 EBUILD gentoo-functions-0.5.ebuild 956 SHA256 f063e86f75560ac91b37c2a077d42db322dccd43ab94f55b35d8f097b15e7437 SHA512 9a655e3b0d7e138001f6a2388d53c0e98baed1d55858153c6478f339fd2c69490134cc22b79d0e0fd304c70095cc0449274829d8e40b6c0c1624f92e35c85ceb WHIRLPOOL b59a0451fc8020a1425bb7f8d7851f32dd6c6be29b724bdf4b18bcf174d0030c73015a4404368523439db5dc90fca71f43ad50209658a9e8e56b6fcab2a4a6bd EBUILD gentoo-functions-0.6.ebuild 961 SHA256 b6926f2a84010b318af9ffdc58a43ef10dd97464f105902aa09b4c8c30a97eb0 SHA512 12316adfad3ec79b3b62c91f291427062b4ad613a5e81ad3d1478dc0caf04c4b8bcd1d198f836423c91585a6aa5d2510af95758a7fbcc9265055c65e3fc9810f WHIRLPOOL cb414ea1eb43bae3b3223a288105b317842ba72f1f53640c7932b1bd7357fad361964f02ccb6b49fc61b6aaef2bc904df9624cbe7f9e2c5c6b973108d754cae9 -EBUILD gentoo-functions-9999.ebuild 957 SHA256 66d07d5c933eb185a03697ea0a1dd701e8d5b357a9e037f9a99a094de6a20add SHA512 5a51a9b225a7b9709dac2c4450e1f4f762a5e4220c820c923800c42c748ecfa1ef3ad06a65d22f34fb65e236fbe16f95cd0278245a04214f8621fcba5303bf53 WHIRLPOOL df0104ef31a852e2be5d0558fc83a9e920be37fd3daaf311ac8db1098a7aca885c7a18d9eb0b85b33b2e18ddc259f93a7bd10e10ce06b7737f852f99a107ece8 -MISC ChangeLog 2668 SHA256 2e5aa5e8d57b4b945afd7de0c6e9872622ea514a732e97e2336f4d62fe91bead SHA512 ddf8bfd7d14e17ad3478e5f46c175394f480447b59d3997db7288e0cf9df1ab3075480cb23f4183709a18ee26b37085fe98aafdfc258ee1f0fe357ed020c047c WHIRLPOOL ea1dd36f15c762c20f59f4c2ea44366ec07aea8d0a56e574b86ce3bc902166c4176e0250552de9c78958cc63f40a3c16a2cb3b27544f455a3f7e0de122c77a64 +EBUILD gentoo-functions-9999.ebuild 958 SHA256 49ba0985090f0600c37432cc49463f8adae044091e6f38d9e4eb5554642a469d SHA512 f7aff0d51a9254cb8a6de359712a80e1cd8550a775bf0180f310177081202e32b99d0d554c216b5e5a32f7c28fcf507214b1dc75d1869a09a1f68d6befdb6efa WHIRLPOOL 7f56f81b43763992f419047a24281058ad5196181d910dc46dd43d5b6795808f09077b27702f3009f614f8d1c6fdb2c7ed094b18a09750c9d19b1c2b0cf0d9fe +MISC ChangeLog 2800 SHA256 f378503b7fbeb86a40992de422b91704deb2a1cf38c6d5795478d47620e91693 SHA512 75dee724878ecd5d9e2e9cfd2912a7694f4e6e708789bccd7ab573db59fc21aaa95b358da5f7f0e38756106a8ebe2af84849d9f0183ee30647167a25b7d237c2 WHIRLPOOL 1a81522e24292af929f3c170b9355f79564f9aa3ffef120116ab0d709325e90db3b08028f3095ade9183a74ca778eb66a694bf8e829ce25a9dee179b10c80722 MISC metadata.xml 497 SHA256 dc476822c150eee2ffccb4e6c5295fa3207b9006c275c428c26589378e6a709e SHA512 a8a463caa1b0295a30a794308bb107957df0990520b51d5212dcf6d2a80aaea373a2265e8378569f1db5bd3b96f83f49f187a26839dd4a2e5d47ed2e51418449 WHIRLPOOL 811f2249a8e4b35a16e00fde4265e1d5e6f528a5d573e7a435136ce470c7b68941f0dc669b6569496eb79a887ec86041beafbe627fb271daadb253dbfeb9b59b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlO5tEMACgkQblQW9DDEZThv7gCePG9hSGG0c1xsIQoQSD3hHtXn -EZ4AniCXXLK/yTfnml0Q35InPI42HGrF -=SH2s +iEYEAREIAAYFAlO5vo4ACgkQblQW9DDEZTjRaACdFU9Ia/Mc3OwF91YEQcvVS7Ui +oiEAoLqq6mvZzykQnp3+8LZNbER/y/Tr +=FUVj -----END PGP SIGNATURE----- diff --git a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild index 0e426d0eee31..f75276851bb4 100644 --- a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild +++ b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild @@ -1,18 +1,18 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild,v 1.3 2014/05/10 17:20:59 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild,v 1.4 2014/07/06 21:24:10 williamh Exp $ EAPI=5 if [[ ${PV} = 9999* ]]; then - vcs=git-r3 + inherit git-r3 EGIT_REPO_URI="git://github.com/gentoo/${PN}.git" else SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" fi -inherit ${vcs} toolchain-funcs +inherit toolchain-funcs DESCRIPTION="base functions required by all gentoo systems" HOMEPAGE="http://www.gentoo.org" |