Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-electronics/qelectrotech/files: qelectrotech-0.2-fix-paths.patch
Date: Sat, 29 Aug 2009 18:33:02
Message-Id: E1MhXYA-0004HA-2S@stork.gentoo.org
1 flameeyes 09/08/29 23:41:38
2
3 Added: qelectrotech-0.2-fix-paths.patch
4 Log:
5 Fix ebuild to not install in /usr/local. Thanks to Davide Pesavento in bug #282908.
6 (Portage version: 2.2_rc40/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 sci-electronics/qelectrotech/files/qelectrotech-0.2-fix-paths.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-electronics/qelectrotech/files/qelectrotech-0.2-fix-paths.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-electronics/qelectrotech/files/qelectrotech-0.2-fix-paths.patch?rev=1.1&content-type=text/plain
13
14 Index: qelectrotech-0.2-fix-paths.patch
15 ===================================================================
16 diff -Naur qelectrotech-0.2-src~orig/qelectrotech.pro qelectrotech-0.2-src/qelectrotech.pro
17 --- qelectrotech-0.2-src~orig/qelectrotech.pro 2009-08-30 01:18:08.000000000 +0200
18 +++ qelectrotech-0.2-src/qelectrotech.pro 2009-08-30 01:30:29.000000000 +0200
19 @@ -5,19 +5,19 @@
20 # Chemins utilises pour la compilation et l'installation de QET
21 unix {
22 # Chemins UNIX
23 - COMPIL_PREFIX = '/usr/local/'
24 - INSTALL_PREFIX = '/usr/local/'
25 + COMPIL_PREFIX = '/usr/'
26 + INSTALL_PREFIX = '/usr/'
27 QET_BINARY_PATH = 'bin/'
28 QET_COMMON_COLLECTION_PATH = 'share/qelectrotech/elements/'
29 QET_LANG_PATH = 'share/qelectrotech/lang/'
30 QET_EXAMPLES_PATH = 'share/qelectrotech/examples/'
31 QET_LICENSE_PATH = 'doc/qelectrotech/'
32 - QET_MIME_XML_PATH = '../share/mime/application/'
33 - QET_MIME_DESKTOP_PATH = '../share/mimelnk/application/'
34 - QET_MIME_PACKAGE_PATH = '../share/mime/packages/'
35 + QET_MIME_XML_PATH = 'share/mime/application/'
36 + QET_MIME_DESKTOP_PATH = 'share/mimelnk/application/'
37 + QET_MIME_PACKAGE_PATH = 'share/mime/packages/'
38 QET_DESKTOP_PATH = 'share/applications/'
39 QET_ICONS_PATH = 'share/icons/hicolor/'
40 - QET_MAN_PATH = 'man/'
41 + QET_MAN_PATH = 'share/man/'
42 }
43 win32 {
44 # Chemins Windows
45 @@ -94,9 +94,6 @@
46 examples.path = $$join(INSTALL_PREFIX,,,$${QET_EXAMPLES_PATH})
47 examples.files = examples/*
48
49 -copyright.path = $$join(INSTALL_PREFIX,,,$${QET_LICENSE_PATH})
50 -copyright.files = LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog
51 -
52 mime_xml.path = $$join(INSTALL_PREFIX,,,$${QET_MIME_XML_PATH})
53 mime_xml.files = misc/x-qet-*.xml
54
55 @@ -123,7 +120,7 @@
56 man.extra = sh man/compress_man_pages.sh
57
58 # L'installation comprend la copie du binaire, des elements, des fichiers de langue et du fichier LICENSE
59 -INSTALLS += target elements lang copyright
60 +INSTALLS += target elements lang
61 # Sous Unix, on installe egalement l'icone, un fichier .desktop, des fichiers mime et les pages de manuel
62 unix {
63 INSTALLS += desktop mime_xml mime_desktop mime_package icons man examples