Attachment #268143 for bug #216114

Lines 27-34 DARCS_COMMIT_OPTIONS="-a" Link Here

(-)a/etckeeper.conf (-2 / +6 lines)
27		27
28	# The high-level package manager that's being used.	28	# The high-level package manager that's being used.
29	# (apt, pacman-g2, yum etc)	29	# (apt, pacman-g2, yum etc)
30	HIGHLEVEL_PACKAGE_MANAGER=apt	30	# For gentoo this is emerge
		31	#HIGHLEVEL_PACKAGE_MANAGER=apt
		32	HIGHLEVEL_PACKAGE_MANAGER=emerge
31		33
32	# The low-level package manager that's being used.	34	# The low-level package manager that's being used.
33	# (dpkg, rpm, pacman-g2, etc)	35	# (dpkg, rpm, pacman-g2, etc)
34	LOWLEVEL_PACKAGE_MANAGER=dpkg	36	# For gentoo this is equery
		37	#LOWLEVEL_PACKAGE_MANAGER=dpkg
		38	LOWLEVEL_PACKAGE_MANAGER=equery

Lines 8-10 if [ "$LOWLEVEL_PACKAGE_MANAGER" = dpkg ]; then Link Here

(-)a/list-installed.d/50list-installed (+5 lines)
8	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then	8	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then
9	rpm -qa --qf "%\|epoch?{%{epoch}}:{0}\|:%{name}-%{version}-%{release}.%{arch}\n" \| sort	9	rpm -qa --qf "%\|epoch?{%{epoch}}:{0}\|:%{name}-%{version}-%{release}.%{arch}\n" \| sort
10	fi	10	fi
		11
		12	if [ "$LOWLEVEL_PACKAGE_MANAGER" = equery ]; then
		13	equery list \| cut -f1
		14	fi
		15

Lines 99-104 writefile () { Link Here

(-)a/update-ignore.d/01update-ignore (+4 lines)
99	ignore "*.pacorig"	99	ignore "*.pacorig"
100	ignore "*.pacsave"	100	ignore "*.pacsave"
101	nl	101	nl
		102	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "equery" ]; then
		103	comment "new and old versions of conffiles, stored by emerge"
		104	ignore ".ebuild"
		105	nl
102	fi	106	fi
103		107
104	comment "old versions of files"	108	comment "old versions of files"

Return to bug 216114

Lines 23-29 install: Link Here

(-)a/Makefile (-2 lines)
23	$(INSTALL_DATA) $(CONFFILE) $(DESTDIR)$(etcdir)/etckeeper/etckeeper.conf	23	$(INSTALL_DATA) $(CONFFILE) $(DESTDIR)$(etcdir)/etckeeper/etckeeper.conf
24	$(INSTALL_EXE) etckeeper $(DESTDIR)$(bindir)/etckeeper	24	$(INSTALL_EXE) etckeeper $(DESTDIR)$(bindir)/etckeeper
25	$(INSTALL_DATA) etckeeper.8 $(DESTDIR)$(mandir)/man8/etckeeper.8	25	$(INSTALL_DATA) etckeeper.8 $(DESTDIR)$(mandir)/man8/etckeeper.8
26	$(INSTALL_DATA) bash_completion $(DESTDIR)$(etcdir)/bash_completion.d/etckeeper
27	ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),apt)	26	ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),apt)
28	$(INSTALL_DATA) apt.conf $(DESTDIR)$(etcdir)/apt/apt.conf.d/05etckeeper	27	$(INSTALL_DATA) apt.conf $(DESTDIR)$(etcdir)/apt/apt.conf.d/05etckeeper
29	mkdir -p $(DESTDIR)$(etcdir)/cruft/filters-unex	28	mkdir -p $(DESTDIR)$(etcdir)/cruft/filters-unex
Lines 36-42 ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),yum) Link Here
36	$(INSTALL_DATA) yum-etckeeper.py $(DESTDIR)$(prefix)/lib/yum-plugins/etckeeper.py	35	$(INSTALL_DATA) yum-etckeeper.py $(DESTDIR)$(prefix)/lib/yum-plugins/etckeeper.py
37	$(INSTALL_DATA) yum-etckeeper.conf $(DESTDIR)$(etcdir)/yum/pluginconf.d/etckeeper.conf	36	$(INSTALL_DATA) yum-etckeeper.conf $(DESTDIR)$(etcdir)/yum/pluginconf.d/etckeeper.conf
38	endif	37	endif
39	-./etckeeper-bzr/__init__.py install --root=$(DESTDIR) \|\| echo "** bzr support not installed"
40	echo "** installation successful"	38	echo "** installation successful"
41		39
42	clean: etckeeper.spec	40	clean: etckeeper.spec