dev-util/cdiff: Took package, drop old, Version Bump
authorJustin Lecher <jlec@gentoo.org>
Fri, 14 Nov 2014 07:10:59 +0000 (07:10 +0000)
committerJustin Lecher <jlec@gentoo.org>
Fri, 14 Nov 2014 07:10:59 +0000 (07:10 +0000)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

dev-util/cdiff/ChangeLog
dev-util/cdiff/Manifest
dev-util/cdiff/cdiff-0.9.1.ebuild [deleted file]
dev-util/cdiff/cdiff-0.9.3.ebuild
dev-util/cdiff/cdiff-0.9.6.ebuild [moved from dev-util/cdiff/cdiff-0.9.2.ebuild with 66% similarity]
dev-util/cdiff/cdiff-0.9.ebuild [deleted file]
dev-util/cdiff/cdiff-9999.ebuild
dev-util/cdiff/metadata.xml

index 7f5b1de66401251a613a83a2ff6a0f5239e675aa..fc37e42a0d068ff5751e00e183613c7d356616f1 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/cdiff
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/ChangeLog,v 1.27 2014/11/14 01:23:25 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/ChangeLog,v 1.28 2014/11/14 07:10:58 jlec Exp $
+
+*cdiff-0.9.6 (14 Nov 2014)
+
+  14 Nov 2014; Justin Lecher <jlec@gentoo.org> -cdiff-0.9.ebuild,
+  -cdiff-0.9.1.ebuild, -cdiff-0.9.2.ebuild, cdiff-0.9.3.ebuild,
+  +cdiff-0.9.6.ebuild, cdiff-9999.ebuild, metadata.xml:
+  Took package, drop old, Version Bump
 
   14 Nov 2014; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
   Maintainer needed.
index cd22babb4da65080dc30749e49f8785d4b2a54f4..c700c05190b0d683359d75764e05bcb37d335450 100644 (file)
@@ -1,12 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX cdiff-0.9.2-disable-unimportant-failing-test.patch 383 SHA256 70e82adad4c75d669e9b4ef2363d8b2d47d1603189345a50857619cf4dd2fcff SHA512 598cf3d4ccbffb6ac71c3e60c4402001d18172d1f7fb309290c94b0f5d2541c4fc1c6557cb1d5780e993e3fefb84314acb2515ab6e585affb7172327794fb4f9 WHIRLPOOL b96203035ecab6371adb662ff5467d212e311153a28d3fdd4af1fe391dfd91785a136ce7f55b0dc3b2fae05fd72c4ec7b765ec3ae9da8fbe1111aa5f948e4506
-DIST cdiff-0.9.1.tar.gz 28359 SHA256 b099239223151df274a3b2f94499ae3c1ef746e70a68a940a8395487d034570c SHA512 f3554fd843091e423c044ae46c3d497f14e8f9c623d1df5a2e3096c2746e15a4a1266744c4fa47083c5f9319e67d069e06d2e9477d8a3339c9ef4b2a33370fde WHIRLPOOL a3e766c876acf2bed1e9594b05465aad7cd599b8a1760f732fcb94c18091306871651b6b9b47b5931e8498c2755c3e78838252ecde3754b8252e127d902ddd90
-DIST cdiff-0.9.2.tar.gz 28987 SHA256 83ecc296ce1dadf386b92584d8f9608732279c20973777cbac0b3f2201a8b7c4 SHA512 59a2b2f1125d100f792da14bee626475c5949443a0abfec719f964ae77d3266b1d0c35ad843cb60b3f8d92959448e30c251484247e52181c6289f5abab261bc8 WHIRLPOOL f4359a38690f852fe58a9c89cc1d87d8b0c2501c612002bdb936787b3e3465b29cbadd1052c562e014411148bc30e3bdf154349912ffd409616240b9edfb692a
 DIST cdiff-0.9.3.tar.gz 29355 SHA256 893ffb90d3b9723318bfc9fd02bcefae69d9bbb1f7ac99e357bbee87dc269e6e SHA512 c4b980d0948b34ed978c1063101ca27a374ae69b1a5a525a8cabaa8d344a58651a6728b92b433bc1561265d5b201a93e601d9c5cb5e843d696d04f465ef9fc8c WHIRLPOOL 0c4013ca742534b205bd619d4d01604bbc4aeb6b56dadfcf5e686e56c79224b468c766ade0dcaf8491cd7a1f355c32745c65e02f402116b4b2741fef7c717fe2
-DIST cdiff-0.9.tar.gz 28194 SHA256 fb22c1e7fefd1762e9df1666875da2312526f7d729c4bd07a47947898f4ae666 SHA512 9076309324b6cf3cf08ad2c0b322d53054a11650de827a3cd9a2b59d1788dac4f365944e562f10c7b0a60f792c664bb60d432ba175a5ae001578ac5ad34c4a52 WHIRLPOOL 9c715b9ea5d4de7460260ad13d22df1c6247276e96afe300b4bad20629f8a0b82627119443d37c9a1e93b4af1ed58ab2b459bcba5576c4948556e11ee6154031
-EBUILD cdiff-0.9.1.ebuild 640 SHA256 7154ef2793118dbed5afcd42484741555b035c977dd38e0765efb499a1b3ea39 SHA512 ed695628992a1d33e72053a21e93da508538ce19ddee01c41ae0d1d304f7aae5d9899639c24efbb9b3d08dc8aed3637ee4b02ea4d2db00e610bf036e0286f2aa WHIRLPOOL a4ddbc44d1b1c329f63e10254a8eb538e91a64ab6e4e94bac487c700325d126f73a9d63d83864ef2fb2c20227527a687d0de06bd9690a74124bde66a25b4d653
-EBUILD cdiff-0.9.2.ebuild 1002 SHA256 eb5364ed5148c40718e3b654919156358ccfb4490c02230d41aab700337e4480 SHA512 38d7c30b491d158884fcbb773384b5c1c47a205dc7a868a1da5bb0707ceca4852780100931cdcacd1756e1321aa49feb22495d74c1273b3c1f465edb2d2abda6 WHIRLPOOL 0e9815d937ff7643d96253f2e9fba1d27cdccf8930a0f9c13c3b0468189c03be63afbeeb1c4434af8e3c92d81087d7d547f7203ebef5173fdf39b6ca59cee6c5
-EBUILD cdiff-0.9.3.ebuild 1011 SHA256 1f5e0ce281f7e8bcfcd029ac5caed9fd8a11f2d48793f049ca9e2462bb51a64a SHA512 0d6334cda71973fb3ab5e57cfb94942414bc7fc8b151fe1139ffec1ba397bbec813a94824ee9ccb7fbac03ec082be9a3dcbfd222a88ad15f6aac081f1a637bc3 WHIRLPOOL 9f0db8f8f5e2e68cd8e1660304d52d14994c5394c73080dea179ab324af14904f00886f99fb290a4ebad89476c8f50653cedd296bef5e0e22fac8f96f3c41794
-EBUILD cdiff-0.9.ebuild 638 SHA256 624f20340911ef3208e05aab5b0b068d5e5396b5045895fde25688a9fcaf224b SHA512 99ae5219e5638fd86128c5cf5ced1f7a862c5cb7bbf0aaa3b2279ced2bcba3df9c284e36ad5c73bcd7a098cc70ff8e28914fd72b0a29e929a313b807e238f90d WHIRLPOOL e1ee8f629601ebf82ff5adb6f5312955a79790a510b1ebad66799517be8e80006f7b5a0944285736c47657c5c04e4f6b6894ffdbd5ddde2e3f4472fce45764e6
-EBUILD cdiff-9999.ebuild 1012 SHA256 5cd3a848f81cdabf3db97ecbc341890585964720591b26ab3185c8f8d86fd06d SHA512 45a620af3eb40802ec125d48a7b182b6cc758cf5854428ecd1ec50eda9c9475a3c2982758ce9e35909f9f071a00d3eb66f72651c8433876b0fdef95b343d102b WHIRLPOOL 4cd2637a9a6dc2d54d36657335ed88c36f6ed08c888737cabb72863cf4bf614068356300c7c088656d31ebd9f8e46ad1a5280318711da8eea4c74f205335ceca
-MISC ChangeLog 4269 SHA256 f127ad10dcd5d4047df1855b7d0d89809dce17214fc982726a1068d112eae69d SHA512 04ac54ec97cc8a2522f72c559b3f2c70ccb828205bb573df7ec7ec8fa1bf56d24abce121fcbbe0bc0b19e5d6206b198f52ac9eb5104545bac4162d3815b19176 WHIRLPOOL 9fad755078249e81513957fb42ef189ed7f522af1f99145c9f3b909089058d1fd2aee8efad519f46c57be48739fe9305772137a945f88173975259943e21b83d
-MISC metadata.xml 307 SHA256 2833226aa63ca41a5bc30f25f275790c4aa61a85befd55f11cb2252230d0109a SHA512 d09423dd97c015c9d8244e560edc63a0160d139673ccdb4a873bbf0a345db4ed9ab9caefcf9518ecf1939ce60ff047409c2eefccd557f13836b8f55f09170e1c WHIRLPOOL da1e4fe247683aa69542e084162fd3ebf5ddc36d71de21be38aa58a83b90d7a41fa9c692d938079fae63d9c86d56a0b1e87d0090890c5fb7300435c6f6ada41d
+DIST cdiff-0.9.6.tar.gz 30751 SHA256 a2fe898344f80ff5ecfd1d4bea7908422aeb0193f58b7669b485b8f7f978ae1b SHA512 8ae4d3dd26a53ba806f750736d7fcdddcae435d9492045e7ec57fa4b818125d0fe0f015d23910f393fa729b1c010ba3bf7bc5144f4794fe178a8a3e25d830480 WHIRLPOOL b799956392ea7b650b14d7073248a7a436281b5bbe6f11a53fe1c792543b46b279da24c795fb9bc49d1b4b35bee8518fd97e4486cc6cde3c8f932f828b2d35ce
+EBUILD cdiff-0.9.3.ebuild 1022 SHA256 aa9a20d2b8601939c48eeb36a061a72deb7db42c7d6bb238f71729330425d461 SHA512 f40f7a0b2443235cb979bdb88d6cd8c6a05f8d0e32a5d09fc2384fa0c3b8f1dddae218302ca950e937af1df769652c309d87e6cccc63d0160f810847889ef3ea WHIRLPOOL bfd7e5132d47905ab4e4657c81d9ce8791e48e2d44ddc30ba4af51e31a7d4e4d71933c8144a95d4993bc6069162514498e3cff3c506fbf489562391fed172d6a
+EBUILD cdiff-0.9.6.ebuild 1029 SHA256 f3eb12fcd60370bdace70f29734d77f1b59017ac23ac6f8f9c6d46c6413d5b7e SHA512 36320cbd77d0b4598629fbf281dd3633f8c6a78631d54ab999c23c66bba42ce0d38e791dde637c6181e979453448ff0aa99804821446f2a006597cc189f6ce37 WHIRLPOOL 9a4c06ac05a4307e757463c54beb0e8fc7de34bbc12a730769406ab9b4f83a0febb7f31fa35fbcc1467e651313b319b0e927a16f25df059990fdc6948d330b61
+EBUILD cdiff-9999.ebuild 1028 SHA256 e8c025f82a181eab0c584636cee64a17caabc2986bdd63bc27daf786cda3d08f SHA512 faa79dca51b57bfd9b904e45714f27399bf3b6c6c494606819f00cca17eaf135fb59c14c4284479abf7f9b6daed06c4681fe03eedfd2d977fd9905d7b03319c5 WHIRLPOOL 8d6e83800edbf47c0803abfe0be1828ac157da9c252966ad1dd930837fe3382faa3d71b86b3113dfda2ea285f5f48be651f860993ae3c60ff113289c82594b77
+MISC ChangeLog 4521 SHA256 cbe91bae951412f5e325908bf9ac2d58dd7f5af31caad9178bad88f515ee5c42 SHA512 3680c8b6f4072482816e5de34f708903ea710e1f837b00ef693680d81910e4c6648574f219e1bd4daf6804c84a1c1353c3a3d470cd77199ae2aa9ab2339d2691 WHIRLPOOL e9b0df614cfd7683f142f546e122b6aac9f22ea12591bbcd450ef8fe7eea56011cdc9655c973d044e4b157f02b20fbb0eb642ff5afd60dda22b2607decfc2c9a
+MISC metadata.xml 325 SHA256 dee6cddf57c314910ab9b015da8a521077e1027ab1e4badaba2e72256af5f860 SHA512 1b2b97f7e3ef635c0e363bf96edf915b432c4d669c3f47da4545755107cf284e9ecd21ef88b44afdd5104aea5fb63fc92c28a92f9481368107d3cef2e477edb4 WHIRLPOOL 45267048ab34bca25bbb909d72ed2bc23152809f9f62c4251ed02971ed32ea6cb9743951335d8062404e5ca1bc93525ed9d91bcbc646a7b6fea217a8c13daa4e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCgBmBQJUZasDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirnhAP/AwQLEEiOEs6NHnzrivIo+Fh
+BM4QAgzBg5rXPv4B84wR8LZAHiKVF/9haALWCvmGK8l3oPjKubNZRoO7xtqn4cw4
+TswTL/p0LvvfWn/KT2+NVIDMJ99l0ybhQHguwWwrxVlAsP3XdYsoQo3GO0T8oxuG
+eCV+yVrFlkqVGneBs1b/LdkDr2lDNVvflFhn8wzmtI46ofY+a72r6JGtt8SdbqHh
+Ex6VjzbhuiKqRDsbzjofXRgb7MhSir7s6QMvIHzDENlOEwrnpFHdMztiQWjUCZqG
+/Vny2bMGt7NYUaQergFK6eQEAS0/IVN75tpreTXCPxPyPw4PIZtCJ/BHUbjJs9bK
+RiDR9nvZAdEedO/Djx3i5dikFeb/XRTBkG3O3Yex9UK2/o6LGMHml+eC2OOVSx93
+QuDNDGNEDEKclYRt2DHwsQKNLiA2qnAEJNTO4DGjEWf4bojLiKRcloQFZdXj11wF
+7O9tyc5/uhQpMd4jHrIJujQX/O1OnjhnARrhLDgAZI38zgVwzv+PcHyoE0iTHFFo
+SP93t7gX+GZduRb+Ld4NPtTHK+ywi+xFEHj5IOf0z6FSJ7s56s7NeOtUxea1Ca8r
+Vqq/lKZ+HYXCWW54bcc2FEmbCiivN1ZTUfuvDgu+75zSpt6WbOnuArUoAgfNLz7q
+VR1EztdVuGfP02M2U2Rf
+=u/kA
+-----END PGP SIGNATURE-----
diff --git a/dev-util/cdiff/cdiff-0.9.1.ebuild b/dev-util/cdiff/cdiff-0.9.1.ebuild
deleted file mode 100644 (file)
index 7541c8b..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.1.ebuild,v 1.5 2014/08/10 21:26:08 slyfox Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2} )
-DOCS=( CHANGES README.rst )
-
-inherit distutils-r1
-
-DESCRIPTION="Colored, side-by-side diff terminal viewer"
-HOMEPAGE="https://github.com/ymattw/${PN}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="!app-misc/colordiff
-       dev-python/setuptools[${PYTHON_USEDEP}]
-       sys-apps/less"
-RDEPEND="${DEPEND}"
index d233907cc90c8cdbc0d53f3d170f93699d914720..bae7d3afe45d4fbba539fd50af95cd530414f210 100644 (file)
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.3.ebuild,v 1.6 2014/08/10 21:26:08 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.3.ebuild,v 1.7 2014/11/14 07:10:58 jlec Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
 DOCS=( CHANGES README.rst )
 
 inherit distutils-r1
@@ -24,7 +24,8 @@ HOMEPAGE="https://github.com/ymattw/${PN}"
 LICENSE="BSD"
 SLOT="0"
 
-DEPEND="!app-misc/colordiff
+DEPEND="
+       !<app-misc/colordiff-1.0.13-r1
        dev-python/setuptools[${PYTHON_USEDEP}]
        sys-apps/less"
 
similarity index 66%
rename from dev-util/cdiff/cdiff-0.9.2.ebuild
rename to dev-util/cdiff/cdiff-0.9.6.ebuild
index 593f5275d308c6d6c6a506bfa9da85a204fe2316..4dc607f100fb01f75b32bf664620428cd260bfad 100644 (file)
@@ -1,16 +1,15 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.2.ebuild,v 1.8 2014/08/10 21:26:08 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.6.ebuild,v 1.1 2014/11/14 07:10:58 jlec Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-DOCS=( CHANGES README.rst )
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
 
 inherit distutils-r1
 
 if [[ "${PV}" != *"9999"* ]] ; then
-       KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+       KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
        SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 else
        KEYWORDS=""
@@ -24,16 +23,21 @@ HOMEPAGE="https://github.com/ymattw/${PN}"
 LICENSE="BSD"
 SLOT="0"
 
-DEPEND="!app-misc/colordiff
+DEPEND="
+       !<app-misc/colordiff-1.0.13-r1
        dev-python/setuptools[${PYTHON_USEDEP}]
        sys-apps/less"
 
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-disable-unimportant-failing-test.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-unimportant-failing-test.patch )
+
+DOCS=( CHANGES.rst README.rst )
 
 python_test() {
        python_export_best
+
        ${PYTHON} tests/test_cdiff.py || die "Unit tests failed."
+
        ./tests/regression.sh || die "Regression tests failed."
 }
diff --git a/dev-util/cdiff/cdiff-0.9.ebuild b/dev-util/cdiff/cdiff-0.9.ebuild
deleted file mode 100644 (file)
index 4196529..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-0.9.ebuild,v 1.6 2014/08/10 21:26:08 slyfox Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2} )
-DOCS=( CHANGES README.rst )
-
-inherit distutils-r1
-
-DESCRIPTION="Colored, side-by-side diff terminal viewer"
-HOMEPAGE="https://github.com/ymattw/${PN}"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="!app-misc/colordiff
-       dev-python/setuptools[${PYTHON_USEDEP}]
-       sys-apps/less"
-RDEPEND="${DEPEND}"
index 20b9a0b46e395145bb7b395e2193fecc31cd5185..053bf69a6ecb5281b39fc127739215e68bedc721 100644 (file)
@@ -1,11 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-9999.ebuild,v 1.3 2014/08/10 21:26:08 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cdiff/cdiff-9999.ebuild,v 1.4 2014/11/14 07:10:58 jlec Exp $
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-DOCS=( CHANGES README.rst )
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
 
 inherit distutils-r1
 
@@ -24,7 +23,8 @@ HOMEPAGE="https://github.com/ymattw/${PN}"
 LICENSE="BSD"
 SLOT="0"
 
-DEPEND="!app-misc/colordiff
+DEPEND="
+       !<app-misc/colordiff-1.0.13-r1
        dev-python/setuptools[${PYTHON_USEDEP}]
        sys-apps/less"
 
@@ -32,6 +32,8 @@ RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.9.2-disable-unimportant-failing-test.patch )
 
+DOCS=( CHANGES.rst README.rst )
+
 python_test() {
        python_export_best
 
index bf93908a32a53a42d5eb67a38aeb04d460dbb516..ebf35368e3087976a8a67670e4295aa25074bbfb 100644 (file)
@@ -1,8 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
+    <email>jlec@gentoo.org</email>
+    <name>Justin Lecher</name>
   </maintainer>
   <longdescription>
     Colored, side-by-side diff terminal viewer.