Version bump. Remove old.

Package-Manager: portage-2.2.18/cvs/Linux x86_64

diff --git a/sys-apps/etckeeper/ChangeLog b/sys-apps/etckeeper/ChangeLog
index dd1e0c381f614ae97aa320d9b4188e94861dc6c2..8cccf10a21e56d61692fec949f6646f0d67a9cc2 100644 (file)
--- a/sys-apps/etckeeper/ChangeLog
+++ b/sys-apps/etckeeper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/etckeeper
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/ChangeLog,v 1.48 2015/04/08 18:27:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/ChangeLog,v 1.49 2015/04/12 21:43:56 mrueg Exp $
+
+*etckeeper-1.18 (12 Apr 2015)
+
+  12 Apr 2015; Manuel Rüger <mrueg@gentoo.org> +etckeeper-1.18.ebuild,
+  +files/etckeeper-1.18-gentoo.patch, -etckeeper-1.12.ebuild,
+  -files/etckeeper-1.12-gentoo.patch:
+  Version bump. Remove old.
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> etckeeper-1.11-r1.ebuild,
   etckeeper-1.12.ebuild:

diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 70c5412bc0f7c87bd761d17f63fa7a581033c980..0940d60af1e5e36f17256b2e004f0a856c9f3423 100644 (file)
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,36 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 99etckeeper 60 SHA256 237108fb8d1b16ba51410acea5963991de7a2eef9db7594d67a7f725772da16f SHA512 b2c49d5a1fe2fb8e59d6b4d85b6e2176a8bf8486cb120698050c84e067c3ec47cbd681a7b1fd1739730380f95e9c7c9092462e1f8e4bb6b9c9986b03da83443f WHIRLPOOL d41e2caa2b1ec0cd57defb10ff01f2acd3c7d043d19c90bb3b18573d957e0f7a2f21f56390d30e9306272ab45cd7407219a63f53c369cf84016008ef94a6ad2e
 AUX bashrc 116 SHA256 ed9584cd6fdc180dbd3c3d332b07f0287698c9a5602664b8442fea2743141e5a SHA512 8ea8195aa7d65370382c05c92951157b133914d946eec17da4cec32e469130553bdffd91261ce571f5cd31577d5381818ab2deb3f1e6ac872f054dd2798ceb0e WHIRLPOOL b15d4a65c31d7243993204619b2b4d9b1f4bcf539abf43d20fc8fce9d9eabd928a466b5139e66c35430f0e9c9c103344b4ceffa328a4374a7d45dbef0cb4e672
 AUX bashrc-r1 114 SHA256 1d29da179b460ecc317097fe3d1ab341ef34c45855e2531580aa6cdce44cb776 SHA512 2c3e068413dec16e14b196a1c3eb945af5cbc0be99c9705dce18a7c6d3f70d625aedd2799cad085236923bbeaeafa0edbf7a1f97736ca548b4269257ffbeb01c WHIRLPOOL 56a311167c8e2ee4f7d0e2de11a305750f8075fa117f8b057a59c8684112806908685ba9326a5902478f821a8921fdb05984762bd24abbae60e2a9a5ff55db6c
 AUX etckeeper-1.11-gentoo.patch 2189 SHA256 3017c1c43fc8d55678ae8d222e230403f0d07e6b25ce0d97ecfedf87d7ec7b00 SHA512 b099c12771fb2deb2a79eda2829037b8ecfc0cac2a6280da01146f89cdd5ca37c548045fae9992985ffd4826964256ae3fea7c1e599c9755849b79604d4ded95 WHIRLPOOL ed4bed5b337ed8a6fa01a1e61dd1d3ab84ebcc2d13b8525d8b49d115a6ba91bb19d1951f62a08c05d4843bfce94ba166865c6e0ec5bd210661bc5d23ed36a88a
-AUX etckeeper-1.12-gentoo.patch 3088 SHA256 6eedafbc3f3761da466b8c15a9aee0a67286ea80d7ac14971bbe9dc8c4402891 SHA512 92130437be1ef10f8bca022511c1a95dd8e942866ddf71c94db260630ff8a745d8accfeaabebf3b65c315a42490dec683c139e1dad247ff443fe76a2664c027a WHIRLPOOL 188969e0ff26d5a6b8d167a0cf164ef555b9730412ab176898e5a41f4b67c574376f476d3b1f1c5644f63f94f0ea8d465190cf5f81dfdd4cc285e97a20d97677
 AUX etckeeper-1.15-gentoo.patch 3298 SHA256 b531fb1d21f8487bffeb947dbe24033d8c23eb4bc9fe33726df83ca883d62623 SHA512 a4491490e5707394ed1a507bb3840a1203307ad14e47eae71a5d723babc50f61ebe13194629e7b9c6017a605fd249dcad3128dec651a7412626834f97b55ed53 WHIRLPOOL da1792f0843180311df8fd207449c896e29aed056e512690e5910a480588b32f31484948b262aa0546b9524723afe999e0eec9323480c43ff25e358b7024cb91
+AUX etckeeper-1.18-gentoo.patch 3066 SHA256 41e51a02799d3b16b89b175b2171ed0259ef0ef46d963a0159318457287a0ddb SHA512 7cec9bbf989bf6dd0651fee386d180670b796d918d93523bb14a89a80851a3452e488f13c39ec751e1907a460ef34c32afb7fdb6696d7193afb6d70cdd9bb049 WHIRLPOOL 17da4841c502ac8aa9a28ab1c81f92b6ca82a6d99f8830491bce04fff3ea1b8a6ee18fadb488eaa35de5ad331c37b4577d4f187449e494a619a56ee8127e6ad3
 DIST etckeeper-1.11.tar.gz 48100 SHA256 a58b84af8307623f8c59acd6b161bf781909a1dac4b82853baa3098d47decabc SHA512 f9ae79dfee4d97195b0a40ef319d75242662b9717d0293ac9722a7728e22374b6425391e91076ab5e0e4524a16c211511a2857b867d3610ff5c6b2bc561c96a7 WHIRLPOOL 174b857dce5d4ecdb26a01e030c312f57aeb9d1db3eaede5ead4c7e3a08ce05695ca528d226ce1847d28eb14a7360990bb21bb777a710f3b56ab5594ffd01301
-DIST etckeeper-1.12.tar.gz 48342 SHA256 83f4ac7e684d8ecc7a78d7c8b40ca2f26e8c0fad4924cd223a8a804571fcd5a5 SHA512 e1f2d34512845ecdbd06c4c839e31fb468ee94cf6696d8926017f8ace249d0033c0959e5d7b570bba2a06ae4a76880523785c75f868e850c55c103083f8b09b2 WHIRLPOOL c29334f4815c797b0d84477a3db20fdc896e81a5cc864eaa7daaed77c6cbd2adc12a85ddb3718881d50af00b7c41d5c2b571f3fbd0f58a48515126ab7bd250a8
 DIST etckeeper-1.15.tar.gz 48664 SHA256 bc7d692458a259a35c38717f407c2c62de21bb679084ea3097f35a80e788d5fb SHA512 73f9cda3210f727971deac0e5a665a4dbf1e93345d6aa6bfd766df3a5fb9b2345cb4d1efbaecbbfaf4e5d5f881b83f0f590e9026fd79cc5ad67149fb07b6efd7 WHIRLPOOL e4ce74f1be2a7ebf1897ff1c9f648cc36e80e61d42bf62464accc5a4916386ed29f6165de5bf932fbfb1161e535c76712191723eb9feca25e849442d2e96193b
+DIST etckeeper-1.18.tar.gz 56203 SHA256 f9d9eedb2b66c4c40e16824e0899755226543b7c124756f5e0168353fc194d36 SHA512 439a3316b938fe78ab8f0032964ea62392098ca37043960995713f5ca698efb1df4e2c57177ebf3036ec1a8652157ecf990316fd68fd6376bb090b3f0bc42131 WHIRLPOOL 27998338d8bdd9cf32ba443b1cffd45e83b9ca77eb84fead4dfff9c1413425435b15b9be7f18360488ce149f2aba208041cd89f1d2d4b6f5bf8fc5e01130641a
 EBUILD etckeeper-1.11-r1.ebuild 1888 SHA256 fd67f3b3327eaae78581d71ec78cd118f739d18f27ff59b9f67021d25157e2a1 SHA512 d5339d34cef5d7ddb6fa83e3c3346c7675be6c4781235f101a33e165431113c5c03f03f3a5f2fd4c4fa93291d8f23037854fcca14b65a550c54b2bdc7f07e8e7 WHIRLPOOL c06e7d197228d0f7823cc18e03a70b21d97b080b06c27342568e5fcebcbb83365966441b073f64f1af90dbd3f35ec69a30c534112aa4e28f639ab857a66d8e9f
-EBUILD etckeeper-1.12.ebuild 1890 SHA256 5fe99c516460c9d04524577e04d2ba6b2c0dd79894f3293c65c0f862f342bf97 SHA512 7aa75a9120f9b76b7dc30267eae8d2cb886d46661e7c379cfde80e65a1d4eec6c48f38c60337c43c5fb6ec70b9f5071bdedaf0e4114fd1863d35eb6982bc2c35 WHIRLPOOL 3bff0ff857949b35c3181a00764ef866bcd2009feb7aca26c6758c424f9322b21273f58d5e8812049fe159bacf4f442b8c4722caef7a8076cedfc70a5e83ccc1
 EBUILD etckeeper-1.15.ebuild 1900 SHA256 170bed405e79d2930e237fb27021cee59936e84aa6293f4e782988ee6421ed19 SHA512 34e6afd81ddf0050c85e53354a5a898710988959b93617ff694d8429bb5138c596dbf221bbc8fb2f83a85afd16d22ab20f89b8230fad1c84504721231b6bf66f WHIRLPOOL 84637b98912ecc03de5f09b8c1b368043caf16f4dc3f5ad58b1e5befad7232addea6f6b35b27a903c6704ac7f51c02223346f6ca5ce54df303c1ebc0c3e6a2e4
-MISC ChangeLog 6478 SHA256 7f0219da87e431006da83a09f54e01ff8d656c6d2346877df76f22814bef05eb SHA512 d3ddf5899d89894ad322ed57e65f3d4852f901d6d357044efe572c31c845740eea9faa48befb9d4be1ce41997372dfa0e38e93175be441ca5c6d5742f0285c05 WHIRLPOOL 79deb2fe61ba29f444ac0cfcb28aadde206730d001c4ee2032399a16a3209ad61e7905b8b12fb76ff3e38bf2c9a8f752a30062945b95eb3dce248843820c11ca
+EBUILD etckeeper-1.18.ebuild 1894 SHA256 0bfff79599019a25474aa655f6cfc8b26c316b492c06ad9db1f774f0789554e3 SHA512 7f275f1519a5391b692caf62c74a33578a60e6c26550689d4f5bbc097ecb16073a6aa5cdf720ef1ea96846a3799ea2127a7fd656b48e95dd2a422314948e67cf WHIRLPOOL 6f9522f2610b5a481c857f2ed93466d80e32c2b258c78f045b0612d4622fdd9ce1fd5cd4c6b8c4f7181e9715a7410ea6391a7151f9a247593e585259b4e76ea9
+MISC ChangeLog 6709 SHA256 48a118be97f3bc8d6bf5b92a8159aa2ca44ec43baf1c78f9c686b0a24973f9f5 SHA512 80c2c650a8615a9804e38f0b69f1f36ee83c642a2dd6d4b4c396063813d8ea6e93e15fa5f55637aeafbe0eb81e44657d831c74414f1b999ddfd00ff75501c1c2 WHIRLPOOL 044fc05cb7d0191f98ee83365a065ae09f2dadfb5fdb0cc3ad4093323c4a5ee8502a45ed0a286bd307fa7084c726f93e2c5ccb36f979fce8b61c1d2c42d41fb5
 MISC metadata.xml 765 SHA256 778a812a11ab05db9c023d83f155a78afc8335aa6440da6d0c3f0d3433b80203 SHA512 a70938956b7cd51a43f2cd3c472ebf62f80d705520cf9b00a8cb49ce260d15a6d6d86b9d7afc93820a62ffe6dc8bdf377becb7a9cc26546911fb697318000063 WHIRLPOOL 51a7d628af4ab30348702bee5a79e9597c9ae8050b8c83e1877b32cdd50409aadb79eb0b4c1e582a44d0b48483b743ff27450a70f910929d527b06aac5c13b69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQJ8BAEBCABmBQJVJXM9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO5DEQAJ3aLyOvp4BmvcGh9MKUYnu+
-Gbuz4NixKP625gChdAxPM79GQ0rL5+IzkwvRK1FqH3YSBD9+LDJAAUBLST1WBuUk
-sjs7NK2txAFRi4dcHGSxGkYQvGsW/q1p/BmztHDqouS1zYgNY0m5Kz3diaOX1vhV
-qWMli2VlohNDJTNNLnlrrFDNDEV5+1nG+M3ZJdiNzk2NA+32cf+VMlmlKN0JTKYV
-Sy2WcuM3GKf8ygmSUw+MXK52WtJWJ5W1bSgk2xtrpteFLgJAy2jgCRehpCxwFX4M
-jEnRt2DQOeASdv9WLc7Wh6j8/sjQhUpzdu6YmaOGcYBME5x1EU10q14ynpDORSLT
-oA+YCIWJkUpOWqO7/MBs6wAXmwueV0p9gzV6pWaTJls72zhhoKXwoPvrDBCXHRAc
-f4ze7LEmpcSLjnJnFlZ4q/7xc19GVRLrmRnZXLrVbbzPYsSZZDfrcy+ZSwfFaRxF
-vsd4qfMvHVSaqVRs0zbl+GSAdPQfO4IQS4ywL45RsoaU5gOfg3/F3w1kK8wamGCT
-vZPRL92kyPsM9xR6UAn0juATWJB/Llx5At6KPpbx6JO+W43bXfsX9+teji7H5gN0
-ESEUO3JURqaGxP/hqMXE3vq42jZFnKWjrZ4ygCoIx5akDe4zOcOSAK37z9nxZlEk
-2BQLu8yPQsx2vMLEnMkE
-=OtVH
------END PGP SIGNATURE-----

diff --git a/sys-apps/etckeeper/etckeeper-1.12.ebuild b/sys-apps/etckeeper/etckeeper-1.18.ebuild
similarity index 91%
rename from sys-apps/etckeeper/etckeeper-1.12.ebuild
rename to sys-apps/etckeeper/etckeeper-1.18.ebuild
index 29c0fbbada24837378dc7f4e7f3b5d7ee25a4651..dc41b01fd7c0d4eb9083e18aee8780b1fbb4b99b 100644 (file)
--- a/sys-apps/etckeeper/etckeeper-1.12.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.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/sys-apps/etckeeper/etckeeper-1.12.ebuild,v 1.2 2015/04/08 18:27:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/etckeeper/etckeeper-1.18.ebuild,v 1.1 2015/04/12 21:43:56 mrueg Exp $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit eutils bash-completion-r1 prefix python-r1
 
 DESCRIPTION="A collection of tools to let /etc be stored in a repository"
-HOMEPAGE="http://kitenet.net/~joey/code/etckeeper/"
+HOMEPAGE="https://etckeeper.branchable.com/"
 SRC_URI="https://github.com/joeyh/etckeeper/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -51,9 +51,9 @@ src_install(){
        fi
 
        newbashcomp bash_completion ${PN}
-       dodoc README.md TODO
+       dodoc doc/README.mdwn
        docinto examples
-       dodoc "${FILESDIR}"/bashrc
+       newdoc "${FILESDIR}"/bashrc-r1 bashrc
 
        if use cron ; then
                exeinto /etc/cron.daily

diff --git a/sys-apps/etckeeper/files/etckeeper-1.12-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18-gentoo.patch
similarity index 58%
rename from sys-apps/etckeeper/files/etckeeper-1.12-gentoo.patch
rename to sys-apps/etckeeper/files/etckeeper-1.18-gentoo.patch
index 75bd829a3327f410df527a387908b2392b10b42c..a5018bd77d1a1a86185ca61517fc2819e53cc681 100644 (file)
--- a/sys-apps/etckeeper/files/etckeeper-1.12-gentoo.patch
+++ b/sys-apps/etckeeper/files/etckeeper-1.18-gentoo.patch
@@ -1,14 +1,14 @@
-From bca936861ff64309383875c8dffcce0be6b8b00e Mon Sep 17 00:00:00 2001
+From 385d0e828d57e4998dd62fa34d5d929768fb894d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
-Date: Sat, 14 Jun 2014 14:47:55 +0200
+Date: Sun, 12 Apr 2015 23:39:30 +0200
 Subject: [PATCH] Support Gentoo's package managers.
 
 
 diff --git a/Makefile b/Makefile
-index 13ce4fe..37b09de 100644
+index c95d51a..4be900e 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -26,7 +26,6 @@ install:
+@@ -28,7 +28,6 @@ install: etckeeper.version
        mkdir -p $(DESTDIR)$(mandir)/man8
        $(INSTALL_DATA) etckeeper.8 $(DESTDIR)$(mandir)/man8/etckeeper.8
        mkdir -p $(DESTDIR)$(etcdir)/bash_completion.d
@@ -16,32 +16,36 @@ index 13ce4fe..37b09de 100644
  ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),apt)
        mkdir -p $(DESTDIR)$(etcdir)/apt/apt.conf.d
        $(INSTALL_DATA) apt.conf $(DESTDIR)$(etcdir)/apt/apt.conf.d/05etckeeper
-@@ -47,7 +46,6 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper)
+@@ -52,7 +51,6 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper)
        mkdir -p $(DESTDIR)$(prefix)/lib/zypp/plugins/commit
-       $(INSTALL_DATA) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py
+       $(INSTALL) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py
  endif
--      -./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed"
+-      -$(PYTHON) ./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed"
        echo "** installation successful"
  
- clean: etckeeper.spec
+ clean: etckeeper.spec etckeeper.version
 diff --git a/etckeeper.conf b/etckeeper.conf
-index f988c10..29ea111 100644
+index 2aec35e..0a9c88b 100644
 --- a/etckeeper.conf
 +++ b/etckeeper.conf
-@@ -31,11 +31,17 @@ DARCS_COMMIT_OPTIONS="-a"
+@@ -31,11 +31,21 @@ DARCS_COMMIT_OPTIONS="-a"
  
  # The high-level package manager that's being used.
- # (apt, pacman-g2, yum, zypper etc)
+ # (apt, pacman-g2, yum, dnf, zypper etc)
 -HIGHLEVEL_PACKAGE_MANAGER=apt
-+# Gentoo specific: 
++#HIGHLEVEL_PACKAGE_MANAGER=apt
++
++# Gentoo specific:
 +# For portage this is emerge
 +# For paludis this is cave
- 
 +HIGHLEVEL_PACKAGE_MANAGER=emerge
+ 
  # The low-level package manager that's being used.
  # (dpkg, rpm, pacman, pacman-g2, etc)
 -LOWLEVEL_PACKAGE_MANAGER=dpkg
-+# Gentoo specific: 
++#LOWLEVEL_PACKAGE_MANAGER=dpkg
++
++# Gentoo specific:
 +# For portage this is qlist
 +# For paludis this is cave
 +LOWLEVEL_PACKAGE_MANAGER=qlist
@@ -49,31 +53,28 @@ index f988c10..29ea111 100644
  # To push each commit to a remote, put the name of the remote here.
  # (eg, "origin" for git). Space-separated lists of multiple remotes
 diff --git a/list-installed.d/50list-installed b/list-installed.d/50list-installed
-index f392027..02eb179 100755
+index 2ac569a..91718d4 100755
 --- a/list-installed.d/50list-installed
 +++ b/list-installed.d/50list-installed
-@@ -9,4 +9,8 @@ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then
-       rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort
- elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pacman ]; then
-       pacman -Q
-+elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then
-+      qlist -ICv
-+elif [ "$LOWLEVEL_PACKAGE_MANAGER" = cave ]; then
-+      cave print-packages -r installed
+@@ -17,5 +17,9 @@ else
+               rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort
+       elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pacman ]; then
+               pacman -Q
++      elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then
++              qlist -ICv
++      elif [ "$LOWLEVEL_PACKAGE_MANAGER" = cave ]; then
++              cave print-packages -r installed
+       fi
  fi
 diff --git a/update-ignore.d/01update-ignore b/update-ignore.d/01update-ignore
-index a3aa73d..ba59b7e 100755
+index 098fab8..88243ea 100755
 --- a/update-ignore.d/01update-ignore
 +++ b/update-ignore.d/01update-ignore
-@@ -99,6 +99,14 @@ writefile () {
+@@ -99,6 +99,10 @@ writefile () {
                ignore "*.pacorig"
                ignore "*.pacsave"
                nl
-+      elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" ]; then
-+              comment "new and old versions of conffiles, stored by emerge"
-+              ignore "._cfg*"
-+              nl
-+      elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "cave" ]; then
++      elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" -o "$LOWLEVEL_PACKAGE_MANAGER" = "cave" ]; then
 +              comment "new and old versions of conffiles, stored by emerge"
 +              ignore "._cfg*"
 +              nl
@@ -81,5 +82,5 @@ index a3aa73d..ba59b7e 100755
        
        comment "old versions of files"
 -- 
-2.0.0
+2.3.5