* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog readme.gentoo.eclass
@ 2014-03-17 8:17 Justin Lecher (jlec)
0 siblings, 0 replies; 8+ messages in thread
From: Justin Lecher (jlec) @ 2014-03-17 8:17 UTC (permalink / raw
To: gentoo-commits
jlec 14/03/17 08:17:27
Modified: ChangeLog readme.gentoo.eclass
Log:
Some Gentoo PREFIX love
Revision Changes Path
1.1178 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1178&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1178&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1177&r2=1.1178
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1177
retrieving revision 1.1178
diff -u -r1.1177 -r1.1178
--- ChangeLog 16 Mar 2014 18:38:37 -0000 1.1177
+++ ChangeLog 17 Mar 2014 08:17:27 -0000 1.1178
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1177 2014/03/16 18:38:37 rhill Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1178 2014/03/17 08:17:27 jlec Exp $
+
+ 17 Mar 2014; Justin Lecher <jlec@gentoo.org> python-utils-r1.eclass,
+ readme.gentoo.eclass:
+ Some Gentoo PREFIX love
16 Mar 2014; Ryan Hill <rhill@gentoo.org> toolchain.eclass:
Update my src_uri.
1.8 eclass/readme.gentoo.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?r1=1.7&r2=1.8
Index: readme.gentoo.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- readme.gentoo.eclass 24 May 2013 18:05:27 -0000 1.7
+++ readme.gentoo.eclass 17 Mar 2014 08:17:27 -0000 1.8
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.7 2013/05/24 18:05:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.8 2014/03/17 08:17:27 jlec Exp $
# @ECLASS: readme.gentoo
# @MAINTAINER:
@@ -99,7 +99,7 @@
echo -e "${README_GENTOO_DOC_VALUE}" | while read -r ELINE; do elog "${ELINE}"; done
elog ""
elog "(Note: Above message is only printed the first time package is"
- elog "installed. Please look at /usr/share/doc/${PF}/README.gentoo*"
+ elog "installed. Please look at ${EPREFIX}/usr/share/doc/${PF}/README.gentoo*"
elog "for future reference)"
fi
}
^ permalink raw reply [flat|nested] 8+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog readme.gentoo.eclass
@ 2014-06-24 18:36 Pacho Ramos (pacho)
0 siblings, 0 replies; 8+ messages in thread
From: Pacho Ramos (pacho) @ 2014-06-24 18:36 UTC (permalink / raw
To: gentoo-commits
pacho 14/06/24 18:36:54
Modified: ChangeLog readme.gentoo.eclass
Log:
Allow to handle more README.gentoo files (#513190 by Justin Lecher)
Revision Changes Path
1.1299 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1299&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1299&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1298&r2=1.1299
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1298
retrieving revision 1.1299
diff -u -r1.1298 -r1.1299
--- ChangeLog 23 Jun 2014 08:53:48 -0000 1.1298
+++ ChangeLog 24 Jun 2014 18:36:54 -0000 1.1299
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1298 2014/06/23 08:53:48 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1299 2014/06/24 18:36:54 pacho Exp $
+
+ 24 Jun 2014; Pacho Ramos <pacho@gentoo.org> readme.gentoo.eclass:
+ Allow to handle more README.gentoo files (#513190 by Justin Lecher)
23 Jun 2014; Sergey Popov <pinkbyte@gentoo.org> qt4-r2.eclass:
Simplify documentation files handling by utilizing einstalldocs from eutils
1.9 eclass/readme.gentoo.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?r1=1.8&r2=1.9
Index: readme.gentoo.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- readme.gentoo.eclass 17 Mar 2014 08:17:27 -0000 1.8
+++ readme.gentoo.eclass 24 Jun 2014 18:36:54 -0000 1.9
@@ -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/eclass/readme.gentoo.eclass,v 1.8 2014/03/17 08:17:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.9 2014/06/24 18:36:54 pacho Exp $
# @ECLASS: readme.gentoo
# @MAINTAINER:
@@ -48,6 +48,11 @@
# @DESCRIPTION:
# If non-empty this variable forces elog messages to be printed.
+# @ECLASS-VARIABLE: FILE_SUFFIX
+# @DESCRIPTION:
+# If you want to specify a suffix for README.gentoo file please export it.
+: ${FILE_SUFFIX:=""}
+
# @FUNCTION: readme.gentoo_create_doc
# @DESCRIPTION:
# Create doc file with ${DOC_CONTENTS} variable (preferred) and, if not set,
@@ -68,9 +73,9 @@
fi
eshopts_pop
elif [[ -f "${FILESDIR}/README.gentoo-${SLOT%/*}" ]]; then
- cp "${FILESDIR}/README.gentoo-${SLOT%/*}" "${T}"/README.gentoo
+ cp "${FILESDIR}/README.gentoo-${SLOT%/*}" "${T}"/README.gentoo || die
elif [[ -f "${FILESDIR}/README.gentoo" ]]; then
- cp "${FILESDIR}/README.gentoo" "${T}"/README.gentoo
+ cp "${FILESDIR}/README.gentoo${FILE_SUFFIX}" "${T}"/README.gentoo || die
else
die "You are not specifying README.gentoo contents!"
fi
^ permalink raw reply [flat|nested] 8+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog readme.gentoo.eclass
@ 2013-05-24 18:05 Pacho Ramos (pacho)
0 siblings, 0 replies; 8+ messages in thread
From: Pacho Ramos (pacho) @ 2013-05-24 18:05 UTC (permalink / raw
To: gentoo-commits
pacho 13/05/24 18:05:27
Modified: ChangeLog readme.gentoo.eclass
Log:
Reword sentences a bit
Revision Changes Path
1.838 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.838&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.838&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.837&r2=1.838
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.837
retrieving revision 1.838
diff -u -r1.837 -r1.838
--- ChangeLog 24 May 2013 17:42:05 -0000 1.837
+++ ChangeLog 24 May 2013 18:05:27 -0000 1.838
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.837 2013/05/24 17:42:05 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.838 2013/05/24 18:05:27 pacho Exp $
+
+ 24 May 2013; Pacho Ramos <pacho@gentoo.org> readme.gentoo.eclass:
+ Reword sentences a bit
24 May 2013; Michał Górny <mgorny@gentoo.org> multibuild.eclass:
Fix the race condition in locking code by using $BASHPID instead of $$.
1.7 eclass/readme.gentoo.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?r1=1.6&r2=1.7
Index: readme.gentoo.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- readme.gentoo.eclass 18 May 2013 16:22:27 -0000 1.6
+++ readme.gentoo.eclass 24 May 2013 18:05:27 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.6 2013/05/18 16:22:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.7 2013/05/24 18:05:27 pacho Exp $
# @ECLASS: readme.gentoo
# @MAINTAINER:
@@ -98,8 +98,8 @@
elif ! [[ -n "${REPLACING_VERSIONS}" ]] || [[ -n "${FORCE_PRINT_ELOG}" ]]; then
echo -e "${README_GENTOO_DOC_VALUE}" | while read -r ELINE; do elog "${ELINE}"; done
elog ""
- elog "(Note: Above message will only be printed the first time package"
- elog "is installed. Please look at /usr/share/doc/${PF}/README.gentoo*"
+ elog "(Note: Above message is only printed the first time package is"
+ elog "installed. Please look at /usr/share/doc/${PF}/README.gentoo*"
elog "for future reference)"
fi
}
^ permalink raw reply [flat|nested] 8+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog readme.gentoo.eclass
@ 2013-05-18 16:22 Pacho Ramos (pacho)
0 siblings, 0 replies; 8+ messages in thread
From: Pacho Ramos (pacho) @ 2013-05-18 16:22 UTC (permalink / raw
To: gentoo-commits
pacho 13/05/18 16:22:27
Modified: ChangeLog readme.gentoo.eclass
Log:
Add a note informing people a file is being installed for future reference, http://www.mail-archive.com/gentoo-dev@lists.gentoo.org/msg58207.html
Revision Changes Path
1.832 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.832&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.832&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.831&r2=1.832
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.831
retrieving revision 1.832
diff -u -r1.831 -r1.832
--- ChangeLog 17 May 2013 11:31:47 -0000 1.831
+++ ChangeLog 18 May 2013 16:22:27 -0000 1.832
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.831 2013/05/17 11:31:47 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.832 2013/05/18 16:22:27 pacho Exp $
+
+ 18 May 2013; Pacho Ramos <pacho@gentoo.org> readme.gentoo.eclass:
+ Add a note informing people a file is being installed for future reference,
+ http://www.mail-archive.com/gentoo-dev@lists.gentoo.org/msg58207.html
17 May 2013; Tomáš Chvátal <scarabeus@gentoo.org> -php-ext-pecl-r1.eclass,
-php-ext-source-r1.eclass, -tla.eclass:
1.6 eclass/readme.gentoo.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?r1=1.5&r2=1.6
Index: readme.gentoo.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- readme.gentoo.eclass 5 Mar 2013 22:28:41 -0000 1.5
+++ readme.gentoo.eclass 18 May 2013 16:22:27 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.5 2013/03/05 22:28:41 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.6 2013/05/18 16:22:27 pacho Exp $
# @ECLASS: readme.gentoo
# @MAINTAINER:
@@ -97,6 +97,10 @@
die "readme.gentoo_print_elog invoked without matching readme.gentoo_create_doc call!"
elif ! [[ -n "${REPLACING_VERSIONS}" ]] || [[ -n "${FORCE_PRINT_ELOG}" ]]; then
echo -e "${README_GENTOO_DOC_VALUE}" | while read -r ELINE; do elog "${ELINE}"; done
+ elog ""
+ elog "(Note: Above message will only be printed the first time package"
+ elog "is installed. Please look at /usr/share/doc/${PF}/README.gentoo*"
+ elog "for future reference)"
fi
}
^ permalink raw reply [flat|nested] 8+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog readme.gentoo.eclass
@ 2013-03-03 12:05 Pacho Ramos (pacho)
0 siblings, 0 replies; 8+ messages in thread
From: Pacho Ramos (pacho) @ 2013-03-03 12:05 UTC (permalink / raw
To: gentoo-commits
pacho 13/03/03 12:05:08
Modified: ChangeLog readme.gentoo.eclass
Log:
Change formatting tool as discussed with Ulrich Müller in bug #460050, thanks a lot to him for his help.
Revision Changes Path
1.703 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.703&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.703&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.702&r2=1.703
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.702
retrieving revision 1.703
diff -u -r1.702 -r1.703
--- ChangeLog 3 Mar 2013 00:22:56 -0000 1.702
+++ ChangeLog 3 Mar 2013 12:05:08 -0000 1.703
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.702 2013/03/03 00:22:56 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.703 2013/03/03 12:05:08 pacho Exp $
+
+ 03 Mar 2013; Pacho Ramos <pacho@gentoo.org> readme.gentoo.eclass:
+ Change formatting tool as discussed with Ulrich Müller in bug #460050,
+ thanks a lot to him for his help.
03 Mar 2013; Davide Pesavento <pesa@gentoo.org> autotools-utils.eclass,
kde4-base.eclass, qt4-build.eclass:
1.4 eclass/readme.gentoo.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?r1=1.3&r2=1.4
Index: readme.gentoo.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- readme.gentoo.eclass 4 Feb 2013 18:39:47 -0000 1.3
+++ readme.gentoo.eclass 3 Mar 2013 12:05:08 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.3 2013/02/04 18:39:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.4 2013/03/03 12:05:08 pacho Exp $
# @ECLASS: readme.gentoo
# @MAINTAINER:
@@ -63,7 +63,7 @@
if [[ -n "${DISABLE_AUTOFORMATTING}" ]]; then
echo "${DOC_CONTENTS}" > "${T}"/README.gentoo
else
- echo -e ${DOC_CONTENTS} | fmt > "${T}"/README.gentoo
+ echo -e ${DOC_CONTENTS} | fold -s -w 70 > "${T}"/README.gentoo
fi
eshopts_pop
elif [[ -f "${FILESDIR}/README.gentoo-${SLOT%/*}" ]]; then
^ permalink raw reply [flat|nested] 8+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog readme.gentoo.eclass
@ 2013-02-04 18:39 Pacho Ramos (pacho)
0 siblings, 0 replies; 8+ messages in thread
From: Pacho Ramos (pacho) @ 2013-02-04 18:39 UTC (permalink / raw
To: gentoo-commits
pacho 13/02/04 18:39:47
Modified: ChangeLog readme.gentoo.eclass
Log:
Add a variable to stop autoformatting when not desired, use '-e' option for echo in the autoformatting way to let people control it with sequences recognized by it (see man echo), fix it to work ok with prebuilt packages (#455030 by Brian Harring, Zac Medico and Fabio Erculiani)
Revision Changes Path
1.661 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.661&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.661&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.660&r2=1.661
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.660
retrieving revision 1.661
diff -u -r1.660 -r1.661
--- ChangeLog 4 Feb 2013 13:53:54 -0000 1.660
+++ ChangeLog 4 Feb 2013 18:39:47 -0000 1.661
@@ -1,6 +1,12 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.660 2013/02/04 13:53:54 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.661 2013/02/04 18:39:47 pacho Exp $
+
+ 04 Feb 2013; Pacho Ramos <pacho@gentoo.org> readme.gentoo.eclass:
+ Add a variable to stop autoformatting when not desired, use '-e' option for
+ echo in the autoformatting way to let people control it with sequences
+ recognized by it (see man echo), fix it to work ok with prebuilt packages
+ (#455030 by Brian Harring, Zac Medico and Fabio Erculiani)
04 Feb 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
Introduce python_get_library_path() to obtain the path to the Python library.
1.3 eclass/readme.gentoo.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?r1=1.2&r2=1.3
Index: readme.gentoo.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- readme.gentoo.eclass 24 Jan 2013 21:38:41 -0000 1.2
+++ readme.gentoo.eclass 4 Feb 2013 18:39:47 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.2 2013/01/24 21:38:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.3 2013/02/04 18:39:47 pacho Exp $
# @ECLASS: readme.gentoo
# @MAINTAINER:
@@ -36,6 +36,13 @@
EXPORT_FUNCTIONS src_install pkg_postinst
+# @ECLASS-VARIABLE: DISABLE_AUTOFORMATTING
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# If non-empty, DOC_CONTENTS information will be strictly respected,
+# not getting it automatically formatted by fmt. If empty, it will
+# rely on fmt for formatting and 'echo -e' options to tweak lines a bit.
+
# @ECLASS-VARIABLE: FORCE_PRINT_ELOG
# @DEFAULT_UNSET
# @DESCRIPTION:
@@ -53,22 +60,22 @@
if [[ -n "${DOC_CONTENTS}" ]]; then
eshopts_push
set -f
- echo ${DOC_CONTENTS} | fmt > "${T}"/README.gentoo
- eshopts_pop
- dodoc "${T}"/README.gentoo
- else
- if [[ -f "${FILESDIR}/README.gentoo-${SLOT%/*}" ]]; then
- cp "${FILESDIR}/README.gentoo-${SLOT%/*}" "${T}"/README.gentoo
- dodoc "${T}"/README.gentoo
+ if [[ -n "${DISABLE_AUTOFORMATTING}" ]]; then
+ echo "${DOC_CONTENTS}" > "${T}"/README.gentoo
else
- if [[ -f "${FILESDIR}/README.gentoo" ]]; then
- cp "${FILESDIR}/README.gentoo" "${T}"/README.gentoo
- dodoc "${T}"/README.gentoo
- else
- die "You are not specifying README.gentoo contents!"
- fi
+ echo -e ${DOC_CONTENTS} | fmt > "${T}"/README.gentoo
fi
+ eshopts_pop
+ elif [[ -f "${FILESDIR}/README.gentoo-${SLOT%/*}" ]]; then
+ cp "${FILESDIR}/README.gentoo-${SLOT%/*}" "${T}"/README.gentoo
+ elif [[ -f "${FILESDIR}/README.gentoo" ]]; then
+ cp "${FILESDIR}/README.gentoo" "${T}"/README.gentoo
+ else
+ die "You are not specifying README.gentoo contents!"
fi
+
+ dodoc "${T}"/README.gentoo
+ README_GENTOO_DOC_VALUE=$(< "${T}/README.gentoo")
}
# @FUNCTION: readme.gentoo_print_elog
@@ -85,15 +92,10 @@
readme.gentoo_print_elog() {
debug-print-function ${FUNCNAME} "${@}"
- if [[ -f "${T}"/README.gentoo ]]; then
- if ! [[ -n "${REPLACING_VERSIONS}" ]] || [[ -n "${FORCE_PRINT_ELOG}" ]]; then
- eshopts_push
- set -f
- cat "${T}"/README.gentoo | while read -r ELINE; do elog "${ELINE}"; done
- eshopts_pop
- fi
- else
- die "README.gentoo wasn't created at src_install!"
+ if [[ -z "${README_GENTOO_DOC_VALUE}" ]]; then
+ die "readme.gentoo_print_elog invoked without matching readme.gentoo_create_doc call!"
+ elif ! [[ -n "${REPLACING_VERSIONS}" ]] || [[ -n "${FORCE_PRINT_ELOG}" ]]; then
+ echo -e "${README_GENTOO_DOC_VALUE}" | while read -r ELINE; do elog "${ELINE}"; done
fi
}
^ permalink raw reply [flat|nested] 8+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog readme.gentoo.eclass
@ 2013-01-24 21:38 Pacho Ramos (pacho)
0 siblings, 0 replies; 8+ messages in thread
From: Pacho Ramos (pacho) @ 2013-01-24 21:38 UTC (permalink / raw
To: gentoo-commits
pacho 13/01/24 21:38:41
Modified: ChangeLog readme.gentoo.eclass
Log:
Include FORCE_PRINT_ELOG variable to for printing of messages when desired. Thanks to Tomáš Chvátal for his suggestions.
Revision Changes Path
1.635 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.635&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.635&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.634&r2=1.635
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.634
retrieving revision 1.635
diff -u -r1.634 -r1.635
--- ChangeLog 24 Jan 2013 00:58:47 -0000 1.634
+++ ChangeLog 24 Jan 2013 21:38:41 -0000 1.635
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.634 2013/01/24 00:58:47 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.635 2013/01/24 21:38:41 pacho Exp $
+
+ 24 Jan 2013; Pacho Ramos <pacho@gentoo.org> readme.gentoo.eclass:
+ Include FORCE_PRINT_ELOG variable to for printing of messages when desired.
+ Thanks to Tomáš Chvátal for his suggestions.
24 Jan 2013; Tim Harder <radhermit@gentoo.org> vim-plugin.eclass:
Only display vim plugin help elog messages for new installs.
1.2 eclass/readme.gentoo.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?r1=1.1&r2=1.2
Index: readme.gentoo.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- readme.gentoo.eclass 20 Jan 2013 11:42:30 -0000 1.1
+++ readme.gentoo.eclass 24 Jan 2013 21:38:41 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.1 2013/01/20 11:42:30 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.2 2013/01/24 21:38:41 pacho Exp $
# @ECLASS: readme.gentoo
# @MAINTAINER:
@@ -36,6 +36,11 @@
EXPORT_FUNCTIONS src_install pkg_postinst
+# @ECLASS-VARIABLE: FORCE_PRINT_ELOG
+# @DEFAULT_UNSET
+# @DESCRIPTION:
+# If non-empty this variable forces elog messages to be printed.
+
# @FUNCTION: readme.gentoo_create_doc
# @DESCRIPTION:
# Create doc file with ${DOC_CONTENTS} variable (preferred) and, if not set,
@@ -68,13 +73,20 @@
# @FUNCTION: readme.gentoo_print_elog
# @DESCRIPTION:
-# Print elog messages with "${T}"/README.gentoo contents.
+# Print elog messages with "${T}"/README.gentoo contents. They will be
+# shown only when package is installed at first time.
# Usually called at pkg_postinst phase.
+#
+# If you want to show them always, please set FORCE_PRINT_ELOG to a non empty
+# value in your ebuild before this function is called.
+# This can be useful when, for example, DOC_CONTENTS is modified, then, you can
+# rely on specific REPLACING_VERSIONS handling in your ebuild to print messages
+# when people update from versions still providing old message.
readme.gentoo_print_elog() {
debug-print-function ${FUNCNAME} "${@}"
if [[ -f "${T}"/README.gentoo ]]; then
- if ! [[ "${REPLACING_VERSIONS}" ]]; then
+ if ! [[ -n "${REPLACING_VERSIONS}" ]] || [[ -n "${FORCE_PRINT_ELOG}" ]]; then
eshopts_push
set -f
cat "${T}"/README.gentoo | while read -r ELINE; do elog "${ELINE}"; done
^ permalink raw reply [flat|nested] 8+ messages in thread* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog readme.gentoo.eclass
@ 2013-01-20 11:42 Pacho Ramos (pacho)
0 siblings, 0 replies; 8+ messages in thread
From: Pacho Ramos (pacho) @ 2013-01-20 11:42 UTC (permalink / raw
To: gentoo-commits
pacho 13/01/20 11:42:30
Modified: ChangeLog
Added: readme.gentoo.eclass
Log:
Finally commit readme.gentoo.eclass to create a README.gentoo doc file recording tips shown via elog messages first time the package is merged.
Revision Changes Path
1.627 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.627&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.627&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.626&r2=1.627
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.626
retrieving revision 1.627
diff -u -r1.626 -r1.627
--- ChangeLog 18 Jan 2013 15:00:31 -0000 1.626
+++ ChangeLog 20 Jan 2013 11:42:30 -0000 1.627
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.626 2013/01/18 15:00:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.627 2013/01/20 11:42:30 pacho Exp $
+
+ 20 Jan 2013; Pacho Ramos <pacho@gentoo.org> +readme.gentoo.eclass:
+ Finally commit readme.gentoo.eclass to create a README.gentoo doc file
+ recording tips shown via elog messages first time the package is merged.
18 Jan 2013; Justin Lecher <jlec@gentoo.org> intel-sdp.eclass:
No EPREFIX with helper functions
1.1 eclass/readme.gentoo.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/readme.gentoo.eclass?rev=1.1&content-type=text/plain
Index: readme.gentoo.eclass
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/eclass/readme.gentoo.eclass,v 1.1 2013/01/20 11:42:30 pacho Exp $
# @ECLASS: readme.gentoo
# @MAINTAINER:
# Pacho Ramos <pacho@gentoo.org>
# @AUTHOR:
# Author: Pacho Ramos <pacho@gentoo.org>
# @BLURB: An eclass for installing a README.gentoo doc file recording tips
# shown via elog messages.
# @DESCRIPTION:
# An eclass for installing a README.gentoo doc file recording tips
# shown via elog messages. With this eclass, those elog messages will only be
# shown at first package installation and a file for later reviewing will be
# installed under /usr/share/doc/${PF}
if [[ ${___ECLASS_ONCE_README_GENTOO} != "recur -_+^+_- spank" ]] ; then
___ECLASS_ONCE_README_GENTOO="recur -_+^+_- spank"
inherit eutils
case "${EAPI:-0}" in
0|1|2|3)
die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
;;
4|5)
# EAPI>=4 is required for REPLACING_VERSIONS preventing us
# from needing to export another pkg_preinst phase to save has_version
# result. Also relies on EAPI >=4 default src_install phase.
;;
*)
die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"
;;
esac
EXPORT_FUNCTIONS src_install pkg_postinst
# @FUNCTION: readme.gentoo_create_doc
# @DESCRIPTION:
# Create doc file with ${DOC_CONTENTS} variable (preferred) and, if not set,
# look for "${FILESDIR}/README.gentoo" contents. You can use
# ${FILESDIR}/README.gentoo-${SLOT} also.
# Usually called at src_install phase.
readme.gentoo_create_doc() {
debug-print-function ${FUNCNAME} "${@}"
if [[ -n "${DOC_CONTENTS}" ]]; then
eshopts_push
set -f
echo ${DOC_CONTENTS} | fmt > "${T}"/README.gentoo
eshopts_pop
dodoc "${T}"/README.gentoo
else
if [[ -f "${FILESDIR}/README.gentoo-${SLOT%/*}" ]]; then
cp "${FILESDIR}/README.gentoo-${SLOT%/*}" "${T}"/README.gentoo
dodoc "${T}"/README.gentoo
else
if [[ -f "${FILESDIR}/README.gentoo" ]]; then
cp "${FILESDIR}/README.gentoo" "${T}"/README.gentoo
dodoc "${T}"/README.gentoo
else
die "You are not specifying README.gentoo contents!"
fi
fi
fi
}
# @FUNCTION: readme.gentoo_print_elog
# @DESCRIPTION:
# Print elog messages with "${T}"/README.gentoo contents.
# Usually called at pkg_postinst phase.
readme.gentoo_print_elog() {
debug-print-function ${FUNCNAME} "${@}"
if [[ -f "${T}"/README.gentoo ]]; then
if ! [[ "${REPLACING_VERSIONS}" ]]; then
eshopts_push
set -f
cat "${T}"/README.gentoo | while read -r ELINE; do elog "${ELINE}"; done
eshopts_pop
fi
else
die "README.gentoo wasn't created at src_install!"
fi
}
# @FUNCTION: readme.gentoo_src_install
# @DESCRIPTION:
# Install generated doc file automatically.
readme.gentoo_src_install() {
debug-print-function ${FUNCNAME} "${@}"
default
readme.gentoo_create_doc
}
# @FUNCTION: readme.gentoo_pkg_postinst
# @DESCRIPTION:
# Show elog messages from from just generated doc file.
readme.gentoo_pkg_postinst() {
debug-print-function ${FUNCNAME} "${@}"
readme.gentoo_print_elog
}
fi
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-06-24 18:37 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-17 8:17 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog readme.gentoo.eclass Justin Lecher (jlec)
-- strict thread matches above, loose matches on Subject: below --
2014-06-24 18:36 Pacho Ramos (pacho)
2013-05-24 18:05 Pacho Ramos (pacho)
2013-05-18 16:22 Pacho Ramos (pacho)
2013-03-03 12:05 Pacho Ramos (pacho)
2013-02-04 18:39 Pacho Ramos (pacho)
2013-01-24 21:38 Pacho Ramos (pacho)
2013-01-20 11:42 Pacho Ramos (pacho)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox