Change i18n installation directory.

Package-Manager: portage-2.1.4_rc4

4 files changed, 52 insertions, 10 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index f4001256f70d..88f9c402acb1 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/avidemux
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.117 2007/11/30 20:46:24 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.118 2007/11/30 21:45:16 drac Exp $
+
+  30 Nov 2007; Samuli Suominen <drac@gentoo.org>
+  +files/avidemux-2.4_pre3-i18n.patch, avidemux-2.4_pre3.ebuild:
+  Change i18n installation directory.
 
 *avidemux-2.4_pre3 (30 Nov 2007)
 
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 11d717ed35a3..e2ce9da1877d 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -18,6 +18,10 @@ AUX avidemux-2.3.0-twolame.patch 4048 RMD160 45e4b1333cdc56934e73758a16ffb54ea2b
 MD5 12783df6f9e5d7d6a00aba4f9dadc860 files/avidemux-2.3.0-twolame.patch 4048
 RMD160 45e4b1333cdc56934e73758a16ffb54ea2b81cad files/avidemux-2.3.0-twolame.patch 4048
 SHA256 6c8a7b58882417536645611d75584145960a7b2dd499083ab24220f909c30ac8 files/avidemux-2.3.0-twolame.patch 4048
+AUX avidemux-2.4_pre3-i18n.patch 1748 RMD160 e5ef386c325091268d2222be9606284d4d63de0f SHA1 122ccad94d82648c7f01aabe8d2dc5ac2ef27d66 SHA256 4f5ce419edc37f9d7ee0d6d55376eed55e4662775db3fdf9ab0885dfe1a064e3
+MD5 7d95abd45babe5a8eca7e9202c4f1261 files/avidemux-2.4_pre3-i18n.patch 1748
+RMD160 e5ef386c325091268d2222be9606284d4d63de0f files/avidemux-2.4_pre3-i18n.patch 1748
+SHA256 4f5ce419edc37f9d7ee0d6d55376eed55e4662775db3fdf9ab0885dfe1a064e3 files/avidemux-2.4_pre3-i18n.patch 1748
 AUX avidemux-2.4_pre3-libdca.patch 1029 RMD160 5b792477656c2864711d16574e4134c8573daec0 SHA1 10044fdae9506e4ac216d804aef5cfef9649b4db SHA256 81a460a306c469771ab4ae9b3a2c5f97dc61cb738aad19e1a71a93d952b55e1a
 MD5 2abe84b084d8eb2ee4166e86bafae7d8 files/avidemux-2.4_pre3-libdca.patch 1029
 RMD160 5b792477656c2864711d16574e4134c8573daec0 files/avidemux-2.4_pre3-libdca.patch 1029
@@ -28,14 +32,14 @@ EBUILD avidemux-2.3.0.ebuild 3374 RMD160 fad4576a9c425971550e95d9b583b5b11ad983d
 MD5 c17116df34728e1130e2aa2baa02106e avidemux-2.3.0.ebuild 3374
 RMD160 fad4576a9c425971550e95d9b583b5b11ad983d4 avidemux-2.3.0.ebuild 3374
 SHA256 04bb9ebf92137ccb660aaae601fc841183899c51e823826aca0e874c45112aec avidemux-2.3.0.ebuild 3374
-EBUILD avidemux-2.4_pre3.ebuild 3348 RMD160 5f2908978c106b932c9cb3fe1e6f368313dc2a63 SHA1 45d4e34ca063b5b32e9e684b29e4b77d351727a0 SHA256 a7ebf62878dc3fbc3b33a88d4bf11f00ba27bcc0a9c6f4093f5296ab94491421
-MD5 9cf0fde7fd4efc78f9217a37488c290d avidemux-2.4_pre3.ebuild 3348
-RMD160 5f2908978c106b932c9cb3fe1e6f368313dc2a63 avidemux-2.4_pre3.ebuild 3348
-SHA256 a7ebf62878dc3fbc3b33a88d4bf11f00ba27bcc0a9c6f4093f5296ab94491421 avidemux-2.4_pre3.ebuild 3348
-MISC ChangeLog 21212 RMD160 9fd8cc2aa81bc43c4e2e66649fbdc3723da70830 SHA1 5fedb75d9af5abcaa04662d6d6925d74e7743834 SHA256 5d3ef63ebf477e836bdf240d50e4a62724875a326d3ccdf4584e3dd990d1b29e
-MD5 042b906a62df78c38f06acf7bd57042f ChangeLog 21212
-RMD160 9fd8cc2aa81bc43c4e2e66649fbdc3723da70830 ChangeLog 21212
-SHA256 5d3ef63ebf477e836bdf240d50e4a62724875a326d3ccdf4584e3dd990d1b29e ChangeLog 21212
+EBUILD avidemux-2.4_pre3.ebuild 3386 RMD160 95617602e150757367467c3ab3d8f6bdab9d7450 SHA1 4cf5a99971c000bc4efe2229c5164edf581c0f29 SHA256 3a5e1925786b64dce7b9a58df5bbb4847c0ac40dfdca377a3cd3294b76f4d6af
+MD5 27a57d6b4fab92525e0387648b47818b avidemux-2.4_pre3.ebuild 3386
+RMD160 95617602e150757367467c3ab3d8f6bdab9d7450 avidemux-2.4_pre3.ebuild 3386
+SHA256 3a5e1925786b64dce7b9a58df5bbb4847c0ac40dfdca377a3cd3294b76f4d6af avidemux-2.4_pre3.ebuild 3386
+MISC ChangeLog 21365 RMD160 152a802a6ae488fc142d4f39ddc11a68244fc6e2 SHA1 2a2dbd7822fe7c5791e08c8a5fb7ca372b716731 SHA256 d0f69bc049665b8cc51358997d62249a53e67c220ca41e1c7a1914cff4365add
+MD5 830c5a453ac25216a7677c87d543ff99 ChangeLog 21365
+RMD160 152a802a6ae488fc142d4f39ddc11a68244fc6e2 ChangeLog 21365
+SHA256 d0f69bc049665b8cc51358997d62249a53e67c220ca41e1c7a1914cff4365add ChangeLog 21365
 MISC metadata.xml 318 RMD160 452132dabb8760282f43a49b8f1245c1f879cb56 SHA1 b9cd3e9f43bdd337eb81270e723569d1b4865e1a SHA256 4379b50013e723e18c04e42b0750112cb17af07b82a7b0e3b7aa32bd502124ba
 MD5 d5c5ccb29604d60b3222d8d620b9a55e metadata.xml 318
 RMD160 452132dabb8760282f43a49b8f1245c1f879cb56 metadata.xml 318
diff --git a/media-video/avidemux/avidemux-2.4_pre3.ebuild b/media-video/avidemux/avidemux-2.4_pre3.ebuild
index e5daf09f5c62..2600000d9dc2 100644
--- a/media-video/avidemux/avidemux-2.4_pre3.ebuild
+++ b/media-video/avidemux/avidemux-2.4_pre3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4_pre3.ebuild,v 1.3 2007/11/30 21:07:16 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.4_pre3.ebuild,v 1.4 2007/11/30 21:45:16 drac Exp $
 
 inherit cmake-utils eutils
 
@@ -53,6 +53,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-libdca.patch
+	epatch "${FILESDIR}"/${P}-i18n.patch
 }
 
 src_compile() {
diff --git a/media-video/avidemux/files/avidemux-2.4_pre3-i18n.patch b/media-video/avidemux/files/avidemux-2.4_pre3-i18n.patch
new file mode 100644
index 000000000000..e65e414242b6
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.4_pre3-i18n.patch
@@ -0,0 +1,33 @@
+diff -ur avidemux_2.4_preview3.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp avidemux_2.4_preview3/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp
+--- avidemux_2.4_preview3.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp	2007-10-16 21:23:21.000000000 +0300
++++ avidemux_2.4_preview3/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp	2007-11-30 23:25:31.000000000 +0200
+@@ -53,7 +53,7 @@
+ {

+ 	printf("\n[Locale] Locale: %s\n", QLocale::system().name().toUtf8().constData());

+ 

+-	QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";

++	QString appdir = "/usr/share/avidemux/i18n/";

+ 

+ 	loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());

+ 	loadTranslation(&avidemuxTranslator, appdir + "avidemux_" + QLocale::system().name());

+diff -ur avidemux_2.4_preview3.orig/cmake/Ts.cmake avidemux_2.4_preview3/cmake/Ts.cmake
+--- avidemux_2.4_preview3.orig/cmake/Ts.cmake	2007-10-14 14:58:28.000000000 +0300
++++ avidemux_2.4_preview3/cmake/Ts.cmake	2007-11-30 23:26:38.000000000 +0200
+@@ -63,7 +63,7 @@
+                 

+             SET(qm_files ${qm_files} ${_outXml} ${_out})

+ 

+-			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")

++			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")

+         ENDFOREACH(ts_input ${ts_files})

+ 

+         SET(${_sources} ${${_sources}} ${qm_files})

+@@ -94,7 +94,7 @@
+                 

+             SET(qm_files ${qm_files} ${_out})

+ 

+-			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")

++			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")

+         ENDFOREACH(ts_input ${ts_files})

+ 

+         SET(${_sources} ${${_sources}} ${qm_files})