[gentoo-commits] gentoo-x86 commit in app-text/highlight: highlight-3.9.ebuild highlight-3.12.ebuild highlight-3.3.ebuild ChangeLog

[Mike Frysinger (vapier)]

vapier      12/12/31 06:53:38

  Modified:             highlight-3.9.ebuild highlight-3.12.ebuild
                        highlight-3.3.ebuild ChangeLog
  Log:
  Move boost to DEPEND for all versions since it is not linked against, and move myhlopts setup out of pkg_setup and into src_compile since it is only used with src_* funcs.
  
  (Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

Revision  Changes    Path
1.3                  app-text/highlight/highlight-3.9.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/highlight-3.9.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/highlight-3.9.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/highlight-3.9.ebuild?r1=1.2&r2=1.3

Index: highlight-3.9.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.9.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- highlight-3.9.ebuild	17 Sep 2012 14:59:29 -0000	1.2
+++ highlight-3.9.ebuild	31 Dec 2012 06:53:38 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.9.ebuild,v 1.2 2012/09/17 14:59:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.9.ebuild,v 1.3 2012/12/31 06:53:38 vapier Exp $
 
 EAPI=4
 
@@ -15,13 +15,20 @@
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples qt4"
 
-DEPEND="dev-lang/lua
-	dev-libs/boost
-	qt4? ( x11-libs/qt-gui:4
-		x11-libs/qt-core:4 )"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-lang/lua
+	qt4? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-core:4
+	)"
+DEPEND="${RDEPEND}
+	dev-libs/boost"
 
-pkg_setup() {
+src_prepare() {
+	sed -i -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		src/core/datadir.cpp || die
+}
+
+src_compile() {
 	myhlopts=(
 		"CXX=$(tc-getCXX)"
 		"AR=$(tc-getAR)"
@@ -35,14 +42,7 @@
 		"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
 		"conf_dir=${EPREFIX}/etc/highlight/"
 	)
-}
 
-src_prepare() {
-	sed -i -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
-		src/core/datadir.cpp || die
-}
-
-src_compile() {
 	emake -f makefile "${myhlopts[@]}"
 	if use qt4 ; then
 		cd src/gui-qt



1.4                  app-text/highlight/highlight-3.12.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/highlight-3.12.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/highlight-3.12.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/highlight-3.12.ebuild?r1=1.3&r2=1.4

Index: highlight-3.12.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.12.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- highlight-3.12.ebuild	10 Nov 2012 02:58:13 -0000	1.3
+++ highlight-3.12.ebuild	31 Dec 2012 06:53:38 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.12.ebuild,v 1.3 2012/11/10 02:58:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.12.ebuild,v 1.4 2012/12/31 06:53:38 vapier Exp $
 
 EAPI=4
 
@@ -24,7 +24,12 @@
 	dev-libs/boost
 	virtual/pkgconfig"
 
-pkg_setup() {
+src_prepare() {
+	sed -i -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		src/core/datadir.cpp || die
+}
+
+src_compile() {
 	myhlopts=(
 		"CXX=$(tc-getCXX)"
 		"AR=$(tc-getAR)"
@@ -38,14 +43,6 @@
 		"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
 		"conf_dir=${EPREFIX}/etc/highlight/"
 	)
-}
-
-src_prepare() {
-	sed -i -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
-		src/core/datadir.cpp || die
-}
-
-src_compile() {
 	emake -f makefile "${myhlopts[@]}"
 	if use qt4 ; then
 		cd src/gui-qt



1.9                  app-text/highlight/highlight-3.3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/highlight-3.3.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/highlight-3.3.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/highlight-3.3.ebuild?r1=1.8&r2=1.9

Index: highlight-3.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.3.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- highlight-3.3.ebuild	22 Jan 2012 15:30:29 -0000	1.8
+++ highlight-3.3.ebuild	31 Dec 2012 06:53:38 -0000	1.9
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.3.ebuild,v 1.8 2012/01/22 15:30:29 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.3.ebuild,v 1.9 2012/12/31 06:53:38 vapier Exp $
 
 EAPI=4
 
@@ -15,13 +15,22 @@
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples qt4"
 
-DEPEND="dev-lang/lua
-	dev-libs/boost
-	qt4? ( x11-libs/qt-gui:4
-		x11-libs/qt-core:4 )"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-lang/lua
+	qt4? (
+		x11-libs/qt-gui:4
+		x11-libs/qt-core:4
+	)"
+DEPEND="${RDEPEND}
+	dev-libs/boost"
 
-pkg_setup() {
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-parallel-make.patch
+
+	sed -i -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		src/core/datadir.cpp || die
+}
+
+src_compile() {
 	myhlopts=(
 		"CXX=$(tc-getCXX)"
 		"AR=$(tc-getAR)"
@@ -32,16 +41,7 @@
 		"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
 		"conf_dir=${EPREFIX}/etc/highlight/"
 	)
-}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-parallel-make.patch
-
-	sed -i -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
-		src/core/datadir.cpp || die
-}
-
-src_compile() {
 	emake -f makefile "${myhlopts[@]}"
 	if use qt4 ; then
 		cd src/gui-qt



1.58                 app-text/highlight/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/ChangeLog?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/ChangeLog?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/highlight/ChangeLog?r1=1.57&r2=1.58

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ChangeLog	10 Nov 2012 02:58:13 -0000	1.57
+++ ChangeLog	31 Dec 2012 06:53:38 -0000	1.58
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/highlight
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.57 2012/11/10 02:58:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/ChangeLog,v 1.58 2012/12/31 06:53:38 vapier Exp $
+
+  31 Dec 2012; Mike Frysinger <vapier@g.o> highlight-3.12.ebuild,
+  highlight-3.3.ebuild, highlight-3.9.ebuild:
+  Move boost to DEPEND for all versions since it is not linked against, and move
+  myhlopts setup out of pkg_setup and into src_compile since it is only used
+  with src_* funcs.
 
   10 Nov 2012; Diego E. Pettenò <flameeyes@g.o> highlight-3.12.ebuild:
   Drop usage of boost-utils since it's now pointless.