summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2014-03-18 21:47:53 +0000
committerUlrich Müller <ulm@gentoo.org>2014-03-18 21:47:53 +0000
commit1e0318393467f4f76a5f24f91fb111434dff9b5f (patch)
tree667fb27d30b93c0a3a04bc2f33b787527e10bfb4 /dev-vcs
parentExplicitely pull in autotools.eclass (and dev-util/xfce4-dev-tools) since we ... (diff)
downloadhistorical-1e0318393467f4f76a5f24f91fb111434dff9b5f.tar.gz
historical-1e0318393467f4f76a5f24f91fb111434dff9b5f.tar.bz2
historical-1e0318393467f4f76a5f24f91fb111434dff9b5f.zip
Version bump.
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64 Manifest-Sign-Key: 0x9433907D693FB5B8!
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/git-merge-changelog/ChangeLog8
-rw-r--r--dev-vcs/git-merge-changelog/Manifest24
-rw-r--r--dev-vcs/git-merge-changelog/git-merge-changelog-20140223.ebuild23
3 files changed, 43 insertions, 12 deletions
diff --git a/dev-vcs/git-merge-changelog/ChangeLog b/dev-vcs/git-merge-changelog/ChangeLog
index 10ef123c3180..933884b254c2 100644
--- a/dev-vcs/git-merge-changelog/ChangeLog
+++ b/dev-vcs/git-merge-changelog/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-vcs/git-merge-changelog
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-merge-changelog/ChangeLog,v 1.1 2014/01/04 11:04:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-merge-changelog/ChangeLog,v 1.2 2014/03/18 21:47:34 ulm Exp $
+
+*git-merge-changelog-20140223 (18 Mar 2014)
+
+ 18 Mar 2014; Ulrich Müller <ulm@gentoo.org>
+ +git-merge-changelog-20140223.ebuild:
+ Version bump.
*git-merge-changelog-20140103 (04 Jan 2014)
diff --git a/dev-vcs/git-merge-changelog/Manifest b/dev-vcs/git-merge-changelog/Manifest
index 965f7307d7da..609ef440fa2f 100644
--- a/dev-vcs/git-merge-changelog/Manifest
+++ b/dev-vcs/git-merge-changelog/Manifest
@@ -2,20 +2,22 @@
Hash: SHA256
DIST git-merge-changelog-20140103.tar.xz 299628 SHA256 d3f0694ca65c765a39b5d2381a2c9d735d16d29bef1737fdf38e9d44bcd3ef29 SHA512 cc3287424313f3c3590bbc67ac2615c69154001019915163b59d4600b320abeaf1e72baac7fd53dd2906be16149ce9a325db0b8966bb024db18f4d11b86fd405 WHIRLPOOL 1689456ebc076bbc3e97beb6f63f91bf857a5493ce29b2fd3dea5667891cd6db01f5b30dbdbea510701c153949f1f0287e966af419846be1df06f493523d8fe5
+DIST git-merge-changelog-20140223.tar.xz 298332 SHA256 75a584cee054cafcb1ab7b71dc3beee33b39ea30b50dace48f044ee788560482 SHA512 ea5fcb0a0839e37976e333dc773d0bca43a1fce4821af08c5baba8e5783e129f8b4de4efd4b1b3399a7c1d3796e4094916843ac2d360d81396d67f571e020638 WHIRLPOOL 41182891e268e0ade060cac261d230fda2534fa53aebb40ea2b44e62cef1d5bef69ba9d7a7f6839c4b24135b1012d29f43886b9729fdd801173c2a8c240b3809
EBUILD git-merge-changelog-20140103.ebuild 815 SHA256 a6fce52e46d191c6457afa38ba2ad2a795fd51b3d5fbe231ace3926cbd310756 SHA512 c58835ccc5b37378233f2c7f8f99fdc4ab2f585bc3ec8b988773072dbe854863d7e8b8f6a8486a8d04e79cbf2e11451559a66831c7b0fd95f4d1a1b3adfbb4b1 WHIRLPOOL 4c39239c66e704babbccb046342cd6107258d4c0e0bc623a651f12410c31cd723bbf0043dd2bb1eca34de4755563fe950e74016f3da750ea2a67269531ad313f
-MISC ChangeLog 416 SHA256 a8bb2634d5845bc92b9f4bfaba9254af6d4437604198b1e167b3b1ff07741407 SHA512 33485b903107aaa2e3f108a13ee2311a74f3d67c5ad2ac449bab3d42e0f0b09dbfc181024af9538a474807b3cea14921f51c9f3c9fec5962163b8c4ab8aef317 WHIRLPOOL cdc0930aa79a867e05767ab64e411fc551389fd75ead0a3d6a4e87e49c418d8dbbeea4083b705dca6cdf13182745e084bf9691621ba02ca50f8d4612985ef298
+EBUILD git-merge-changelog-20140223.ebuild 815 SHA256 9740a61f97732b897d7488a878de6a21fc26af77563ba2542f440f388bbef539 SHA512 e0ad6809946aa02b2033f287ce2270c0b363f0bc6d4e7e383d354b3aacc0f2fa3294245a586eae3d8e14302e65dfc98ff0ea476659acfa69349e941f195c3edf WHIRLPOOL ad440b9ec10abb9a3e6a6f3e6ef1665f5fafd5c43edc0d9bddcad2d88fed8ea11d77d0eb091173cdaca022a910f907103025e4ee13d7157a445f5329a5ba47c6
+MISC ChangeLog 565 SHA256 e5cd006c1690e6956bca07f41ade30fb8ae789fdf801224a1900f9c05dadaa57 SHA512 e06868b7cbb956415dcf5ab669aff982883f481d1742e63d3bf01d3f0b48215aceebce910d3ab184af77cc649d9044dba6daba6c3a0bcf6baf81473b50801726 WHIRLPOOL c9da9fe3821ac0d6450fe1ae8b74a838b6fc072c6f34a9cc05815e93ad264f5fcfed1ef55005d43d9f5124119529faab5e64b5c784115d3e0dbf09592202e70c
MISC metadata.xml 198 SHA256 6998c57a835c2c7b81d26f91ae232a8df3128b85ad0348e1fa9444f157c28481 SHA512 5607a8c66738198e21639247c46f41240819c2e0894855a05543e88edd7bac8ef5c5e2f3ca762f9c9bcf85f033235f013d8b40406acda50c1857c4ad51945c40 WHIRLPOOL 60b0c8b7be2ee31dc62d3668b6347266085a756f3f565cb3a962a91877afc1f6beaff21a36b7a2d4de1a4eb5798a9baa1533e2a9495b1552517036d733308873
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
-iQGcBAEBCAAGBQJSx+vBAAoJEJQzkH1pP7W4mCgMAJHl5UaXaJGJ/B5/ZyGHN93v
-nujSkPgF8h+SLW4YPhPCEKsknucasVyQSjyt9b59S5nCtP68oaLky7pK2YCEjLYK
-mfa60XbgpsIYTJjki9HQrstO8/YfCKRI+fJ3M8rmAoHhj5FmYZ00VsZXu0V4dhtY
-6ccPMA00kybKQnXJ8jVz857Dv009ZuXBDm4H8LQQbbg9YoQ+FSyARCxehH+0jn4g
-xhMjHffVv8gCImVwGUyDAdO6MxHXfCmbtecHo6T74MC+7Nc2dhJ2iZGLMFhtCiFZ
-xRlPMSjlV6V4Gy049gGLDUjfYlBfsJQy/IcpVZM9v59m0SrSd5yxiSAEnVdqGKTH
-vGidfG7nOOlcSOILW4GS01oHU2VKOLD/0YRY8EJ93+d5dXu8TKyn0f/78HVhK4B5
-PtInx/NPesJxOIl6TaOMF/vL+n3D+EhHehiu3GZE4hvURtJ+4F7R+aCMhHLkXXW0
-iZCh9pfQqYQTVxTlUjkgLlAv+CTxGa+M1zHN0IURHw==
-=DxDS
+iQGcBAEBCAAGBQJTKMCFAAoJEJQzkH1pP7W4xEAL/0+Scrcrq2KDtBc8oVGf8IpY
+fmAu23d8IlwMHqsgTDxxEm7KhEzqlLQMtriAB+dnJEPSr1RSueUlmjmvMXFGCOYp
+IaHi95+JUVU5lD7tfmsIHsTsGinp7wJ0m0+Q5ioN5u2Xs6pCAQHVXpb6sNdSNw3C
+qRJG7UkuHvDKk+6JEHhLGwVndoZXJZQXAXvIA7rOQ1XFXBFpwYIp2lAoug6q1hbk
+XhiAsVkMOHrlSPPz9lh61hlhK9VYip/jzga/EBE40DBGVjq7iA+ER9gPwOaDQ4Sh
+epYByCZA7HvNt+y7TLHgIi0f+ts8eX3Py4ahyKj/CihWb6uxCHOFo3pojqkLWmro
+tOJsYiH73CfKKPSyR4eR2gxlBMv2GpWdXaUBgH/im4cBNp97b0XAjeBdP7HrBodu
+wVLZT6TvMFDglyhn65GL7ZFNQBZQQY7fVisK2+tIf6gt4YJlVSsiyRraIaSEn+G+
+K3IrRuHhHm0YK4qUWbuxsH74KhcOXAVWiQ8vebI2Og==
+=7iUH
-----END PGP SIGNATURE-----
diff --git a/dev-vcs/git-merge-changelog/git-merge-changelog-20140223.ebuild b/dev-vcs/git-merge-changelog/git-merge-changelog-20140223.ebuild
new file mode 100644
index 000000000000..257f25155f5c
--- /dev/null
+++ b/dev-vcs/git-merge-changelog/git-merge-changelog-20140223.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git-merge-changelog/git-merge-changelog-20140223.ebuild,v 1.1 2014/03/18 21:47:34 ulm Exp $
+
+EAPI=5
+
+DESCRIPTION="Git merge driver for GNU style ChangeLog files"
+HOMEPAGE="http://www.gnu.org/software/gnulib/"
+# snapshot extracted from git://git.savannah.gnu.org/gnulib.git using
+# ./gnulib-tool --create-testdir --without-tests --dir=${PN} ${PN};
+# cd ${PN}; ./configure; make maintainer-clean
+SRC_URI="http://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+ sed -n '/README/{h;:x;n;/^#/!{H;bx};g;s/\n*$//;s:/usr/local:/usr:g;p;q}' \
+ gllib/git-merge-changelog.c >README || die
+}