public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sys-libs/timezone-data: timezone-data-2014e.ebuild ChangeLog
@ 2014-07-07 22:05 Christoph Junghans (ottxor)
  0 siblings, 0 replies; 2+ messages in thread
From: Christoph Junghans (ottxor) @ 2014-07-07 22:05 UTC (permalink / raw
  To: gentoo-commits

ottxor      14/07/07 22:05:08

  Modified:             timezone-data-2014e.ebuild ChangeLog
  Log:
  fix double prefix (bug #516398)
  
  (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C2000586)

Revision  Changes    Path
1.2                  sys-libs/timezone-data/timezone-data-2014e.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild?r1=1.1&r2=1.2

Index: timezone-data-2014e.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- timezone-data-2014e.ebuild	14 Jun 2014 02:40:31 -0000	1.1
+++ timezone-data-2014e.ebuild	7 Jul 2014 22:05:08 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild,v 1.1 2014/06/14 02:40:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild,v 1.2 2014/07/07 22:05:08 ottxor Exp $
 
 EAPI="4"
 
@@ -80,7 +80,7 @@
 src_install() {
 	local zic=""
 	tc-is-cross-compiler && zic="zic=${S}-native/zic"
-	_emake install ${zic} DESTDIR="${ED}"
+	_emake install ${zic} DESTDIR="${D}"
 	dodoc README Theory
 	dohtml *.htm
 



1.304                sys-libs/timezone-data/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.304&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.304&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?r1=1.303&r2=1.304

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- ChangeLog	14 Jun 2014 02:40:31 -0000	1.303
+++ ChangeLog	7 Jul 2014 22:05:08 -0000	1.304
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/timezone-data
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.303 2014/06/14 02:40:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.304 2014/07/07 22:05:08 ottxor Exp $
+
+  07 Jul 2014; Christoph Junghans <ottxor@gentoo.org>
+  timezone-data-2014e.ebuild:
+  fix double prefix (bug #516398)
 
 *timezone-data-2014e (14 Jun 2014)
 





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

* [gentoo-commits] gentoo-x86 commit in sys-libs/timezone-data: timezone-data-2014e.ebuild ChangeLog
@ 2014-07-30  6:46 Mike Frysinger (vapier)
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger (vapier) @ 2014-07-30  6:46 UTC (permalink / raw
  To: gentoo-commits

vapier      14/07/30 06:46:17

  Modified:             timezone-data-2014e.ebuild ChangeLog
  Log:
  Make upgrade logic more robust #506570 by Cănărău Constantin.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

Revision  Changes    Path
1.3                  sys-libs/timezone-data/timezone-data-2014e.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild?r1=1.2&r2=1.3

Index: timezone-data-2014e.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- timezone-data-2014e.ebuild	7 Jul 2014 22:05:08 -0000	1.2
+++ timezone-data-2014e.ebuild	30 Jul 2014 06:46:16 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild,v 1.2 2014/07/07 22:05:08 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2014e.ebuild,v 1.3 2014/07/30 06:46:16 vapier Exp $
 
 EAPI="4"
 
@@ -29,7 +29,11 @@
 	# dir here, but newer one installs symlinks.  Portage will
 	# barf when you try to transition file types.
 	if cd "${EROOT}"/usr/share/zoneinfo 2>/dev/null ; then
-		if [[ -d posix ]] ; then
+		# In case of a failed upgrade, clean up the symlinks #506570
+		if [ -L .gentoo-upgrade ] ; then
+			rm -rf posix .gentoo-upgrade
+		fi
+		if [ -d posix ] ; then
 			rm -rf .gentoo-upgrade #487192
 			mv posix .gentoo-upgrade || die
 			ln -s .gentoo-upgrade posix || die



1.306                sys-libs/timezone-data/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.306&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?rev=1.306&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/timezone-data/ChangeLog?r1=1.305&r2=1.306

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -r1.305 -r1.306
--- ChangeLog	30 Jul 2014 06:33:25 -0000	1.305
+++ ChangeLog	30 Jul 2014 06:46:16 -0000	1.306
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/timezone-data
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.305 2014/07/30 06:33:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.306 2014/07/30 06:46:16 vapier Exp $
+
+  30 Jul 2014; Mike Frysinger <vapier@gentoo.org> timezone-data-2014e.ebuild:
+  Make upgrade logic more robust #506570 by Cănărău Constantin.
 
   30 Jul 2014; Mike Frysinger <vapier@gentoo.org> timezone-data-2014d.ebuild:
   Stabilize for all.





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

end of thread, other threads:[~2014-07-30  6:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-30  6:46 [gentoo-commits] gentoo-x86 commit in sys-libs/timezone-data: timezone-data-2014e.ebuild ChangeLog Mike Frysinger (vapier)
  -- strict thread matches above, loose matches on Subject: below --
2014-07-07 22:05 Christoph Junghans (ottxor)

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