Fix ebuild to not install in /usr/local. Thanks to Davide Pesavento in bug #282908.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 77 insertions, 8 deletions

diff --git a/sci-electronics/qelectrotech/ChangeLog b/sci-electronics/qelectrotech/ChangeLog
index ca5e1453c8f3..ef95a9eb144b 100644
--- a/sci-electronics/qelectrotech/ChangeLog
+++ b/sci-electronics/qelectrotech/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-electronics/qelectrotech
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/qelectrotech/ChangeLog,v 1.1 2009/06/28 15:07:48 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/qelectrotech/ChangeLog,v 1.2 2009/08/29 23:41:38 flameeyes Exp $
+
+*qelectrotech-0.2-r1 (29 Aug 2009)
+
+  29 Aug 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  -qelectrotech-0.2.ebuild, +qelectrotech-0.2-r1.ebuild,
+  +files/qelectrotech-0.2-fix-paths.patch:
+  Fix ebuild to not install in /usr/local. Thanks to Davide Pesavento in bug
+  #282908.
 
 *qelectrotech-0.2 (28 Jun 2009)
 
diff --git a/sci-electronics/qelectrotech/Manifest b/sci-electronics/qelectrotech/Manifest
index 076c81540826..53dbff3bad6c 100644
--- a/sci-electronics/qelectrotech/Manifest
+++ b/sci-electronics/qelectrotech/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX qelectrotech-0.2-fix-paths.patch 2194 RMD160 cc520ac98f8c943128ce427bb559fcf8e20c5e13 SHA1 1858373bd6af1d2072d9983ff9d1e7417efe4050 SHA256 49b0e0b68bd90e6ad4d84d956965c3cb7fb389baa7fc9021261ed15861e58d29
 DIST qelectrotech-0.2-src.tar.gz 7531040 RMD160 f38efc6bcc94170d1e9ef125ab991194553365a2 SHA1 85b4a43a9a86f89861907c5dd9b82e41f64ea599 SHA256 6c8c81aee4dd258ddb3ed55cde83548d0b6b301286785c3c5fad55500c23818c
-EBUILD qelectrotech-0.2.ebuild 932 RMD160 be8f4f1b676445fd727c874844fd14ec72e9977a SHA1 6a1530ed35d725d35af43a867d03d92799f648c4 SHA256 466002172a6c6e7dd8b31054f3da76afb4cea22d2f98d487deb0d7c61559dd5c
-MISC ChangeLog 394 RMD160 736e56f45c982bb59781f8601f84ea7a8abe64d4 SHA1 ff32bd989f35f211a7abb3ec2d2609609da3ef22 SHA256 79ef621d622064b85c3ced4fc4b3a4404d7ef6129f18277a52646909629a66d8
+EBUILD qelectrotech-0.2-r1.ebuild 970 RMD160 b78c9b7a1058cdfb17bb4a5fffa560d304defa65 SHA1 4e548a3fbe7fdc8d4b6deba927f0cad3630f7a4c SHA256 09a7b25f52a04b1da0321d43fff1c6baeb3b68bfd58575061737e83c6c549837
+MISC ChangeLog 676 RMD160 4130d0869a9460a156cdd2879f5553dacb2e6501 SHA1 2944d7812b08e8861d2e0d9775454f10b33bed8d SHA256 bdff399c18dcb6cc27eb1e2931999b9e337de97fbf3c05712337d5f4c54bb777
 MISC metadata.xml 294 RMD160 ac4e1baa0a1839ae0a807a9d4b915134788d6aa1 SHA1 82865de14486cb30dc9ebfe6f1aecc9c86c0075b SHA256 209af586ae032f00659b69da17d4186854660be14b244d31aa0bea2005c2c5ba
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqZvLcACgkQAiZjviIA2XhTfwCg2MCj3bY8prx9V0zNTFKO3lgG
+jdQAoNbYPpAimVvEFdximrsDb3cM2j2r
+=Mu6z
+-----END PGP SIGNATURE-----
diff --git a/sci-electronics/qelectrotech/files/qelectrotech-0.2-fix-paths.patch b/sci-electronics/qelectrotech/files/qelectrotech-0.2-fix-paths.patch
new file mode 100644
index 000000000000..7e34131becf2
--- /dev/null
+++ b/sci-electronics/qelectrotech/files/qelectrotech-0.2-fix-paths.patch
@@ -0,0 +1,48 @@
+diff -Naur qelectrotech-0.2-src~orig/qelectrotech.pro qelectrotech-0.2-src/qelectrotech.pro
+--- qelectrotech-0.2-src~orig/qelectrotech.pro	2009-08-30 01:18:08.000000000 +0200
++++ qelectrotech-0.2-src/qelectrotech.pro	2009-08-30 01:30:29.000000000 +0200
+@@ -5,19 +5,19 @@
+ # Chemins utilises pour la compilation et l'installation de QET
+ unix {
+ 	# Chemins UNIX
+-	COMPIL_PREFIX              = '/usr/local/'
+-	INSTALL_PREFIX             = '/usr/local/'
++	COMPIL_PREFIX              = '/usr/'
++	INSTALL_PREFIX             = '/usr/'
+ 	QET_BINARY_PATH            = 'bin/'
+ 	QET_COMMON_COLLECTION_PATH = 'share/qelectrotech/elements/'
+ 	QET_LANG_PATH              = 'share/qelectrotech/lang/'
+ 	QET_EXAMPLES_PATH          = 'share/qelectrotech/examples/'
+ 	QET_LICENSE_PATH           = 'doc/qelectrotech/'
+-	QET_MIME_XML_PATH          = '../share/mime/application/'
+-	QET_MIME_DESKTOP_PATH      = '../share/mimelnk/application/'
+-	QET_MIME_PACKAGE_PATH      = '../share/mime/packages/'
++	QET_MIME_XML_PATH          = 'share/mime/application/'
++	QET_MIME_DESKTOP_PATH      = 'share/mimelnk/application/'
++	QET_MIME_PACKAGE_PATH      = 'share/mime/packages/'
+ 	QET_DESKTOP_PATH           = 'share/applications/'
+ 	QET_ICONS_PATH             = 'share/icons/hicolor/'
+-	QET_MAN_PATH               = 'man/'
++	QET_MAN_PATH               = 'share/man/'
+ }
+ win32 {
+ 	# Chemins Windows
+@@ -94,9 +94,6 @@
+ examples.path      = $$join(INSTALL_PREFIX,,,$${QET_EXAMPLES_PATH})
+ examples.files     = examples/*
+ 
+-copyright.path     = $$join(INSTALL_PREFIX,,,$${QET_LICENSE_PATH})
+-copyright.files    = LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog
+-
+ mime_xml.path      = $$join(INSTALL_PREFIX,,,$${QET_MIME_XML_PATH})
+ mime_xml.files     = misc/x-qet-*.xml
+ 
+@@ -123,7 +120,7 @@
+ man.extra          = sh man/compress_man_pages.sh
+ 
+ # L'installation comprend la copie du binaire, des elements, des fichiers de langue et du fichier LICENSE
+-INSTALLS += target elements lang copyright
++INSTALLS += target elements lang
+ # Sous Unix, on installe egalement l'icone, un fichier .desktop, des fichiers mime et les pages de manuel
+ unix {
+ 	INSTALLS += desktop mime_xml mime_desktop mime_package icons man examples
diff --git a/sci-electronics/qelectrotech/qelectrotech-0.2.ebuild b/sci-electronics/qelectrotech/qelectrotech-0.2-r1.ebuild
index 5af8b7fc5d09..346fa506aac2 100644
--- a/sci-electronics/qelectrotech/qelectrotech-0.2.ebuild
+++ b/sci-electronics/qelectrotech/qelectrotech-0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-electronics/qelectrotech/qelectrotech-0.2.ebuild,v 1.1 2009/06/28 15:07:48 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-electronics/qelectrotech/qelectrotech-0.2-r1.ebuild,v 1.1 2009/08/29 23:41:38 flameeyes Exp $
 
 EAPI="2"
 
@@ -17,18 +17,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug doc"
 
-RDEPEND="x11-libs/qt-gui:4[debug?]
-	x11-libs/qt-svg:4[debug?]"
+RDEPEND="x11-libs/qt-gui:4
+	x11-libs/qt-svg:4"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
 S="${WORKDIR}"/${MY_P}
 
-src_configure(){
+PATCHES=( "${FILESDIR}/${P}-fix-paths.patch" )
+
+src_configure() {
 	eqmake4
 }
 
-src_install(){
+src_install() {
 	emake INSTALL_ROOT="${D}" install || die "emake install failed"
 	dodoc CREDIT ChangeLog README || die "dodoc failed"
 	if use doc; then