public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in app-portage/cfg-update: ChangeLog cfg-update-1.8.2-r2.ebuild
@ 2010-02-15  7:55 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-02-15  7:55 UTC (permalink / raw
  To: gentoo-commits

ssuominen    10/02/15 07:55:50

  Modified:             ChangeLog
  Added:                cfg-update-1.8.2-r2.ebuild
  Log:
  Replace xxdiff with beediff wrt #303199. Replace USE="gnome" with USE="X" wrt #300344.
  (Portage version: 2.2_rc62/cvs/Linux x86_64)

Revision  Changes    Path
1.23                 app-portage/cfg-update/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/cfg-update/ChangeLog?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/cfg-update/ChangeLog?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/cfg-update/ChangeLog?r1=1.22&r2=1.23

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-portage/cfg-update/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ChangeLog	9 Jan 2010 21:43:09 -0000	1.22
+++ ChangeLog	15 Feb 2010 07:55:49 -0000	1.23
@@ -1,6 +1,14 @@
 # ChangeLog for app-portage/cfg-update
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/ChangeLog,v 1.22 2010/01/09 21:43:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/ChangeLog,v 1.23 2010/02/15 07:55:49 ssuominen Exp $
+
+*cfg-update-1.8.2-r2 (15 Feb 2010)
+
+  15 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +cfg-update-1.8.2-r2.ebuild,
+  +files/cfg-update-1.8.2-xxdiff-to-beediff.patch:
+  Replace xxdiff with beediff wrt #303199. Replace USE="gnome" with USE="X"
+  wrt #300344.
 
   09 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
   cfg-update-1.8.0-r6.ebuild, cfg-update-1.8.2-r1.ebuild:



1.1                  app-portage/cfg-update/cfg-update-1.8.2-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/cfg-update/cfg-update-1.8.2-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-portage/cfg-update/cfg-update-1.8.2-r2.ebuild?rev=1.1&content-type=text/plain

Index: cfg-update-1.8.2-r2.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/cfg-update-1.8.2-r2.ebuild,v 1.1 2010/02/15 07:55:49 ssuominen Exp $

inherit eutils

DESCRIPTION="Easy to use GUI & CLI alternative for etc-update with safe automatic updating functionality"
HOMEPAGE="http://people.zeelandnet.nl/xentric/"
SRC_URI="http://people.zeelandnet.nl/xentric/${P}-r1.tar.gz"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
IUSE="X"

RDEPEND="X? ( >=x11-misc/sux-1.0
	x11-apps/xhost )"

S=${WORKDIR}/${P}-r1

src_unpack() {
	unpack ${A}
	cd "${S}"
	epatch "${FILESDIR}"/${P}-xxdiff-to-beediff.patch
}

pkg_prerm() {
	if [[ ${ROOT} == / ]]
	then
		ebegin "Disabling portage hook"
		cfg-update --ebuild --disable-portage-hook
		eend $?
		ebegin "Disabling paludis hook"
		cfg-update --ebuild --disable-paludis-hook
		eend $?
	fi
}

pkg_postrm() {
	ewarn
	ewarn "If you want to permanently remove cfg-update from your system"
	ewarn "you should manually remove the alias for emerge from /root/.bashrc"
	ewarn "followed by running: unalias emerge"
	ewarn "and remove the index file /var/lib/cfg-update/checksum.index"
	ewarn
	ewarn "If you are just updating to a newer version you should read the"
	ewarn "installation instructions on http://people.zeelandnet.nl/xentric"
	ewarn
}

src_install() {
	exeinto /usr/bin
	doexe cfg-update emerge_with_indexing_for_cfg-update emerge_with_indexing_for_cfg-update_phphelper cfg-update_phphelper emerge_with_indexing_for_cfg-update_bashhelper
	insinto /usr/lib/cfg-update
	doins cfg-update cfg-update_indexing .bashrc test.tgz
	dodoc ChangeLog
	doman *.8
	insinto /etc
	doins cfg-update.conf
	doins cfg-update.hosts
	keepdir /var/lib/cfg-update
}

pkg_postinst() {
	if [[ ! -e "${ROOT}"/var/lib/cfg-update/checksum.index \
		&& -e "${ROOT}"/var/lib/cfg-update/checksum.index ]]
	then
		ebegin "Moving checksum.index from /usr/lib/cfg-update to /var/lib/cfg-update"
		mv "${ROOT}"/usr/lib/cfg-update/checksum.index \
			"${ROOT}"/var/lib/cfg-update/checksum.index
		eend $?
	fi

	if [[ -e "${ROOT}"/usr/bin/paludis ]]
	then
		ewarn
		ewarn "If you have used Paludis version <0.20.0 on your system, chances are"
		ewarn "that you have some corrupted CONTENTS files on your system..."
		ewarn
		ewarn "Please run: cfg-update --check-packages"
		ewarn
		ewarn "The above command will check all packages installed with Paludis and"
		ewarn "will output a list of packages that need to be re-installed with"
		ewarn "Paludis 0.20.0 or higher. If you do not re-install these packages"
		ewarn "you risk losing your custom settings when updating configuration"
		ewarn "files, that belong to these packages, with cfg-update!"
		ewarn
	fi

	if [[ ${ROOT} == / ]]
	then
		ebegin "Moving backups to /var/lib/cfg-update/backups"
		/usr/bin/cfg-update --ebuild --move-backups
		eend $?
	fi

	einfo
	einfo "If this is a first time install, please check the configuration"
	einfo "in /etc/cfg-update.conf before using cfg-update:"
	einfo
	einfo "If your system does not have an X-server installed you need to"
	einfo "change the MERGE_TOOL to sdiff, imediff2 or vimdiff."
	einfo "If you have X installed, set MERGE_TOOL to your favorite GUI tool:"
	einfo "beediff (default), kdiff3, meld, gtkdiff, gvimdiff, tkdiff"
	einfo
	einfo "TIP: to maximize the chances of future automatic updates, run:"
	einfo "cfg-update --optimize-backups"
	einfo
	einfo "For an example of an updating session with screenshots visit:"
	einfo "http://people.zeelandnet.nl/xentric"
	einfo
}






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in app-portage/cfg-update: ChangeLog cfg-update-1.8.2-r2.ebuild
@ 2010-07-10 22:30 Harald van Dijk (truedfx)
  0 siblings, 0 replies; 2+ messages in thread
From: Harald van Dijk (truedfx) @ 2010-07-10 22:30 UTC (permalink / raw
  To: gentoo-commits

truedfx     10/07/10 22:30:03

  Modified:             ChangeLog cfg-update-1.8.2-r2.ebuild
  Log:
  Use bashrc hook function instead of EBUILD_PHASE; check ROOT (#327563 by ferringb)
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.24                 app-portage/cfg-update/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/cfg-update/ChangeLog?rev=1.24&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/cfg-update/ChangeLog?rev=1.24&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/cfg-update/ChangeLog?r1=1.23&r2=1.24

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-portage/cfg-update/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ChangeLog	15 Feb 2010 07:55:49 -0000	1.23
+++ ChangeLog	10 Jul 2010 22:30:03 -0000	1.24
@@ -1,6 +1,11 @@
 # ChangeLog for app-portage/cfg-update
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/ChangeLog,v 1.23 2010/02/15 07:55:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/ChangeLog,v 1.24 2010/07/10 22:30:03 truedfx Exp $
+
+  10 Jul 2010; Harald van Dijk <truedfx@gentoo.org>
+  cfg-update-1.8.2-r2.ebuild, +files/cfg-update-1.8.2-bashrc.patch:
+  Use bashrc hook function instead of EBUILD_PHASE; check ROOT (#327563 by
+  ferringb)
 
 *cfg-update-1.8.2-r2 (15 Feb 2010)
 



1.2                  app-portage/cfg-update/cfg-update-1.8.2-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/cfg-update/cfg-update-1.8.2-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/cfg-update/cfg-update-1.8.2-r2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-portage/cfg-update/cfg-update-1.8.2-r2.ebuild?r1=1.1&r2=1.2

Index: cfg-update-1.8.2-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-portage/cfg-update/cfg-update-1.8.2-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cfg-update-1.8.2-r2.ebuild	15 Feb 2010 07:55:49 -0000	1.1
+++ cfg-update-1.8.2-r2.ebuild	10 Jul 2010 22:30:03 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/cfg-update-1.8.2-r2.ebuild,v 1.1 2010/02/15 07:55:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/cfg-update/cfg-update-1.8.2-r2.ebuild,v 1.2 2010/07/10 22:30:03 truedfx Exp $
 
 inherit eutils
 
@@ -22,6 +22,7 @@
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-xxdiff-to-beediff.patch
+	epatch "${FILESDIR}"/${P}-bashrc.patch
 }
 
 pkg_prerm() {






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-07-10 22:30 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-10 22:30 [gentoo-commits] gentoo-x86 commit in app-portage/cfg-update: ChangeLog cfg-update-1.8.2-r2.ebuild Harald van Dijk (truedfx)
  -- strict thread matches above, loose matches on Subject: below --
2010-02-15  7:55 Samuli Suominen (ssuominen)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox