diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2010-09-02 17:12:25 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2010-09-02 17:12:25 +0000 |
| commit | dd03d8f90c009f43b9ce7c32c3daf6cd034dabb0 (patch) | |
| tree | 7454abdc5ac903b6f8cb2ac649c86bcd825538ce /dev-util/global | |
| parent | Removed x11-plugins/gkrellm-hddtemp (diff) | |
| download | gentoo-2-dd03d8f90c009f43b9ce7c32c3daf6cd034dabb0.tar.gz gentoo-2-dd03d8f90c009f43b9ce7c32c3daf6cd034dabb0.tar.bz2 gentoo-2-dd03d8f90c009f43b9ce7c32c3daf6cd034dabb0.zip | |
Fix bad patch after upstream review.
(Portage version: 2.2_rc72/cvs/Linux i686)
Diffstat (limited to 'dev-util/global')
| -rw-r--r-- | dev-util/global/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-util/global/files/global-5.9.2-localstatedir.patch | 23 | ||||
| -rw-r--r-- | dev-util/global/global-5.9.2-r1.ebuild (renamed from dev-util/global/global-5.9.2.ebuild) | 2 |
3 files changed, 16 insertions, 17 deletions
diff --git a/dev-util/global/ChangeLog b/dev-util/global/ChangeLog index 64f33ac8cfdd..491cfa17f6c6 100644 --- a/dev-util/global/ChangeLog +++ b/dev-util/global/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/global # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/global/ChangeLog,v 1.65 2010/09/01 15:02:03 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/global/ChangeLog,v 1.66 2010/09/02 17:12:25 jer Exp $ + +*global-5.9.2-r1 (02 Sep 2010) + + 02 Sep 2010; Jeroen Roovers <jer@gentoo.org> -global-5.9.2.ebuild, + +global-5.9.2-r1.ebuild, files/global-5.9.2-localstatedir.patch: + Fix bad patch after upstream review. 01 Sep 2010; Jeroen Roovers <jer@gentoo.org> -global-5.8.2.ebuild, global-5.9.1.ebuild, global-5.9.2.ebuild: diff --git a/dev-util/global/files/global-5.9.2-localstatedir.patch b/dev-util/global/files/global-5.9.2-localstatedir.patch index dd8fc95cfe32..952726a12a6e 100644 --- a/dev-util/global/files/global-5.9.2-localstatedir.patch +++ b/dev-util/global/files/global-5.9.2-localstatedir.patch @@ -1,18 +1,11 @@ ---- a/htags/Makefile.am 2010-08-30 14:19:04.000000000 +0200 -+++ b/htags/Makefile.am 2010-09-01 15:19:14.000000000 +0200 -@@ -27,14 +27,8 @@ - - man_MANS = htags.1 - --gtagsdir = ${datadir}/gtags -+gtagsdir = ${localstatedir}/gtags - gtags_DATA = global.cgi.tmpl ghtml.cgi.tmpl completion.cgi.tmpl bless.sh.tmpl \ - jscode_suggest.tmpl jscode_treeview.tmpl style.css.tmpl +--- htags/Makefile.am.orig 2010-08-30 14:19:04.000000000 +0200 ++++ htags/Makefile.am 2010-09-02 19:00:48.000000000 +0200 +@@ -33,7 +33,7 @@ EXTRA_DIST = $(man_MANS) $(gtags_DATA) manual.in global.cgi.tmpl.in completion.cgi.tmpl.in \ const.h c.l cpp.l java.l php.l asm.l --install-data-hook: + install-data-hook: - dir="$(localstatedir)/gtags/sitekeys"; \ -- if [ ! -d $$dir ]; then \ -- $(MKDIR_P) $$dir; \ -- chmod 755 $$dir; \ -- fi ++ dir="$(DESTDIR)$(localstatedir)/gtags/sitekeys"; \ + if [ ! -d $$dir ]; then \ + $(MKDIR_P) $$dir; \ + chmod 755 $$dir; \ diff --git a/dev-util/global/global-5.9.2.ebuild b/dev-util/global/global-5.9.2-r1.ebuild index da60cef92502..d2eafb02d853 100644 --- a/dev-util/global/global-5.9.2.ebuild +++ b/dev-util/global/global-5.9.2-r1.ebuild @@ -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/dev-util/global/global-5.9.2.ebuild,v 1.2 2010/09/01 15:02:03 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/global/global-5.9.2-r1.ebuild,v 1.1 2010/09/02 17:12:25 jer Exp $ EAPI="3" |