diff options
author | Manuel Rüger (mrueg) <gentoo@rueg.eu> | 2012-04-29 20:01:20 +0200 |
---|---|---|
committer | Manuel Rüger (mrueg) <gentoo@rueg.eu> | 2012-04-29 20:01:20 +0200 |
commit | a444fb082b055ad418fd527dff7c97ed48d15f5c (patch) | |
tree | b83e2f4e8e2f9d68bc7ebd54e42038da378469a9 /sys-apps | |
parent | x11-plugins/pidgin-window_merge: Drop usage of git-2 eclass and pull generate... (diff) | |
download | sunrise-reviewed-a444fb082b055ad418fd527dff7c97ed48d15f5c.tar.gz sunrise-reviewed-a444fb082b055ad418fd527dff7c97ed48d15f5c.tar.bz2 sunrise-reviewed-a444fb082b055ad418fd527dff7c97ed48d15f5c.zip |
sys-apps/etckeeper: New ebuild for bug #216114 thanks to hasufell and floppym
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/etckeeper/ChangeLog | 10 | ||||
-rw-r--r-- | sys-apps/etckeeper/Manifest | 6 | ||||
-rw-r--r-- | sys-apps/etckeeper/etckeeper-0.62.ebuild | 61 | ||||
-rw-r--r-- | sys-apps/etckeeper/files/bashrc | 14 | ||||
-rw-r--r-- | sys-apps/etckeeper/files/etckeeper-0.62-gentoo.patch | 60 | ||||
-rw-r--r-- | sys-apps/etckeeper/metadata.xml | 10 |
6 files changed, 161 insertions, 0 deletions
diff --git a/sys-apps/etckeeper/ChangeLog b/sys-apps/etckeeper/ChangeLog new file mode 100644 index 000000000..8d5b2c19b --- /dev/null +++ b/sys-apps/etckeeper/ChangeLog @@ -0,0 +1,10 @@ +# ChangeLog for sys-apps/etckeeper +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*etckeeper-0.62 (29 Apr 2012) + + 29 Apr 2012; Manuel Rüger (mrueg) gentoo@rueg.eu +etckeeper-0.62.ebuild, + +files/etckeeper-0.62-gentoo.patch, +files/bashrc, +metadata.xml: + New ebuild for bug #216114 thanks to hasufell and floppym + diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest new file mode 100644 index 000000000..a68827835 --- /dev/null +++ b/sys-apps/etckeeper/Manifest @@ -0,0 +1,6 @@ +AUX bashrc 231 RMD160 a1eb319591ada9aa3188c69d1c0bb54c3eb63b11 SHA1 d037188ebefb456bc0cfb4b83f5d861ea71bc371 SHA256 535c56e91b5c7d6b1897d7d178f497c8f215eb39f1d207de83765d92ef703225 +AUX etckeeper-0.62-gentoo.patch 2414 RMD160 4ae79fc17fd3b12f84315c954b85072cc39491bf SHA1 88e3ad5288a0976733b5c50450ae3249eacb3ff3 SHA256 7da6953d21b6048aa8ca7c0b7aff0dd4faf7be00fb34ea3cfad2bcd9c33bb4ef +DIST etckeeper-0.62.tar.gz 45600 RMD160 c014f678fe3b099c78c73afb850285917415ea4e SHA1 47449f1ca423f4b25db93e894d64e433e2b95890 SHA256 6de2f571e370d7968c6a3ec38b81c8682b3ae444a77796949a915f9f4b51d874 +EBUILD etckeeper-0.62.ebuild 1678 RMD160 80056e950f2737e4b17103a33804bfc09c068a0f SHA1 d823027859f4e2fc949d4b14b7fa0eb912dd6af5 SHA256 150dc327085e3a8a7e420e703e770fe9f00ccea15a0de02d637f93f3ec88d276 +MISC ChangeLog 355 RMD160 ffad2ee6cf111b35ee2abba49da25ab81392ccac SHA1 14af801181acdc2fd2e1968af032244d6f2abe51 SHA256 310e77e0a7c7f6cd610959e673da8c3577d244ea55b8bcdbccaecb09a7e2e90e +MISC metadata.xml 304 RMD160 db7c9ddd400199dfd93c2a4e918ca4483b649483 SHA1 8de910fc9a5b9c9d1849a50303b047c11917917b SHA256 be1b9ddd7f3f8fe623ae20d717024cd53ed3345231e45752a26ff3ad503faecb diff --git a/sys-apps/etckeeper/etckeeper-0.62.ebuild b/sys-apps/etckeeper/etckeeper-0.62.ebuild new file mode 100644 index 000000000..d0b6fb9ef --- /dev/null +++ b/sys-apps/etckeeper/etckeeper-0.62.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 + +inherit eutils bash-completion-r1 python + +DESCRIPTION="a collection of tools to let /etc be stored in a repository" +HOMEPAGE="http://kitenet.net/~joey/code/etckeeper/" +COMMIT="40eeedebb6be23035aea9d15aed1be706479ce79" +SRC_URI="http://git.kitenet.net/?p=etckeeper.git;a=snapshot;h=${COMMIT};sf=tgz +-> ${P}.tar.gz" + +LICENSE="GPL-2" +IUSE="bazaar" +KEYWORDS="~amd64" +SLOT="0" + +DEPEND="bazaar? ( || ( dev-lang/python:2.7 dev-lang/python:2.6 ) )" +RDEPEND="app-portage/portage-utils + bazaar? ( dev-vcs/bzr )" + +S="${WORKDIR}"/${PN}-${COMMIT:0:7} + +SHAREDIR="/usr/share/${PN}" + +src_prepare(){ + epatch "${FILESDIR}"/${P}-gentoo.patch + if use bazaar; then + python_convert_shebangs 2 "${S}"/etckeeper-bzr/__init__.py + fi +} +src_compile(){ + if use bazaar; then + emake + fi +} +src_install(){ + emake DESTDIR="${D}" install + newbashcomp bash_completion etckeeper + if use bazaar; then + ./etckeeper-bzr/__init__.py install --root="${D}" || die "Error: bzr support installation" + fi + insinto ${SHAREDIR} + doins "${FILESDIR}"/bashrc +} +pkg_postinst(){ + elog "You need to use either bzr, git or mercurial." + elog "If you want dev-vcs/bzr, enable bzr useflag." + elog "Run this command to add etckeeper to your /etc/portage/bashrc" + elog "" + elog "echo \"source ${SHAREDIR}/bashrc\" >> /etc/portage/bashrc" + elog "" + elog "or just put the content with your fancy feature additions into it directly" + elog "Remember to fit /etc/etckeeper/etckeeper.conf to your needs!" + elog "To initialise your etc-dir as a repository run:" + elog "" + elog "etckeeper init -d /etc" + elog "" +} diff --git a/sys-apps/etckeeper/files/bashrc b/sys-apps/etckeeper/files/bashrc new file mode 100644 index 000000000..d53e6b14e --- /dev/null +++ b/sys-apps/etckeeper/files/bashrc @@ -0,0 +1,14 @@ +case "$EBUILD_PHASE" in + + "preinst" | "prerm" ) + if [ -x /usr/bin/etckeeper ]; then + etckeeper pre-install + fi + ;; + + "postinst" | "postrm" ) + if [ -x /usr/bin/etckeeper ]; then + etckeeper post-install + fi + ;; +esac diff --git a/sys-apps/etckeeper/files/etckeeper-0.62-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-0.62-gentoo.patch new file mode 100644 index 000000000..b25f9168b --- /dev/null +++ b/sys-apps/etckeeper/files/etckeeper-0.62-gentoo.patch @@ -0,0 +1,60 @@ +Original patch by Luke-Jr (luke-jr+gentoobugs@utopios.org) +Minor fixes by Manuel Rueger (mrueg@rueg.eu) +See b.g.o #216144 +Gentoo specific additions + +--- Makefile.old 2012-04-29 03:51:41.630628963 +0200 ++++ Makefile 2012-04-29 03:52:20.382629475 +0200 +@@ -23,7 +23,6 @@ + $(INSTALL_DATA) $(CONFFILE) $(DESTDIR)$(etcdir)/etckeeper/etckeeper.conf + $(INSTALL_EXE) etckeeper $(DESTDIR)$(bindir)/etckeeper + $(INSTALL_DATA) etckeeper.8 $(DESTDIR)$(mandir)/man8/etckeeper.8 +- $(INSTALL_DATA) bash_completion $(DESTDIR)$(etcdir)/bash_completion.d/etckeeper + ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),apt) + $(INSTALL_DATA) apt.conf $(DESTDIR)$(etcdir)/apt/apt.conf.d/05etckeeper + mkdir -p $(DESTDIR)$(etcdir)/cruft/filters-unex +@@ -36,7 +35,6 @@ + $(INSTALL_DATA) yum-etckeeper.py $(DESTDIR)$(prefix)/lib/yum-plugins/etckeeper.py + $(INSTALL_DATA) yum-etckeeper.conf $(DESTDIR)$(etcdir)/yum/pluginconf.d/etckeeper.conf + endif +- -./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed" + echo "** installation successful" + + clean: etckeeper.spec +--- etckeeper.conf.old 2012-04-29 02:25:43.747560772 +0200 ++++ etckeeper.conf 2012-04-29 03:15:57.903600622 +0200 +@@ -31,8 +31,10 @@ + + # The high-level package manager that's being used. + # (apt, pacman-g2, yum etc) +-HIGHLEVEL_PACKAGE_MANAGER=apt ++# For gentoo this is emerge ++HIGHLEVEL_PACKAGE_MANAGER=emerge + + # The low-level package manager that's being used. + # (dpkg, rpm, pacman-g2, etc) +-LOWLEVEL_PACKAGE_MANAGER=dpkg ++# For gentoo this is qlist ++LOWLEVEL_PACKAGE_MANAGER=qlist +--- list-installed.d/50list-installed.old 2012-04-29 02:25:33.493560638 +0200 ++++ list-installed.d/50list-installed 2012-04-29 03:14:59.583599851 +0200 +@@ -7,4 +7,6 @@ + egrep '(ok installed|ok config-files)' | cut -f2,3 + elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then + rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort ++elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then ++ qlist -ICv + fi +--- update-ignore.d/01update-ignore.old 2012-04-29 02:25:27.914560566 +0200 ++++ update-ignore.d/01update-ignore 2012-04-29 03:15:46.000600464 +0200 +@@ -99,6 +99,10 @@ + ignore "*.pacorig" + ignore "*.pacsave" + nl ++ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" ]; then ++ comment "new and old versions of conffiles, stored by emerge" ++ ignore "*.cfg_*" ++ nl + fi + + comment "old versions of files" diff --git a/sys-apps/etckeeper/metadata.xml b/sys-apps/etckeeper/metadata.xml new file mode 100644 index 000000000..e2074d8d4 --- /dev/null +++ b/sys-apps/etckeeper/metadata.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>maintainer-wanted@gentoo.org</email> + </maintainer> + <use> + <flag name='bazaar'>Support <pkg>dev-vcs/bzr</pkg> based overlays</flag> + </use> +</pkgmetadata> |