[gentoo-commits] gentoo-x86 commit in app-office/texmaker: ChangeLog texmaker-3.1.ebuild

[Justin Lecher (jlec)]

jlec        11/12/04 10:10:03

  Modified:             ChangeLog texmaker-3.1.ebuild
  Log:
  Respect EPREFIX in all places, fixes poppler-qt4.h: No such file or directory
  
  (Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

Revision  Changes    Path
1.87                 app-office/texmaker/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/ChangeLog?rev=1.87&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/ChangeLog?rev=1.87&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/texmaker/ChangeLog?r1=1.86&r2=1.87

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- ChangeLog	28 Nov 2011 10:31:59 -0000	1.86
+++ ChangeLog	4 Dec 2011 10:10:03 -0000	1.87
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/texmaker
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.86 2011/11/28 10:31:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.87 2011/12/04 10:10:03 jlec Exp $
+
+  04 Dec 2011; Justin Lecher <jlec@g.o> texmaker-3.1.ebuild,
+  files/texmaker-3.1-hunspell.patch:
+  Respect EPREFIX in all places, fixes poppler-qt4.h: No such file or directory
 
   28 Nov 2011; Justin Lecher <jlec@g.o> texmaker-3.1.ebuild:
   Keyworded for prefix, tested by me



1.3                  app-office/texmaker/texmaker-3.1.ebuild

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

Index: texmaker-3.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- texmaker-3.1.ebuild	28 Nov 2011 10:31:59 -0000	1.2
+++ texmaker-3.1.ebuild	4 Dec 2011 10:10:03 -0000	1.3
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.1.ebuild,v 1.2 2011/11/28 10:31:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.1.ebuild,v 1.3 2011/12/04 10:10:03 jlec Exp $
 
 EAPI="3"
 
-inherit base qt4-r2 versionator
+inherit base prefix qt4-r2 versionator
 
 # The upstream version numbering is bad, so we have to remove a dot in the
 # minor version number
@@ -48,8 +48,13 @@
 
 PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
 
+src_prepare() {
+	qt4-r2_src_prepare
+	eprefixify ${PN}.pro configdialog.cpp
+}
+
 src_install() {
-	emake INSTALL_ROOT="${D}" install || die "make install failed"
+	emake INSTALL_ROOT="${ED}" install || die "make install failed"
 
 	insinto /usr/share/pixmaps/texmaker
 	doins utilities/texmaker*.png || die "doins failed."
@@ -60,5 +65,5 @@
 
 pkg_postinst() {
 	elog "A user manual with many screenshots is available at:"
-	elog "/usr/share/${PN}/usermanual_en.html"
+	elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
 }