fix AVIDEMUX_INSTALL_PREFIX and AVIDEMUX_CORECONFIG_DIR cmake variables, they were poiting to non-existent directories, causing build failures on plugins

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 24 insertions, 13 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 863ac3e3871b..cf2fabfd6bef 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/avidemux
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.172 2010/09/01 23:51:12 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.173 2010/09/18 11:06:52 lxnay Exp $
+
+  18 Sep 2010; Fabio Erculiani <lxnay@gentoo.org>
+  avidemux-2.5.1_p5428.ebuild, avidemux-2.5.2.ebuild,
+  avidemux-2.5.3-r1.ebuild, avidemux-2.5.3-r2.ebuild:
+  fix AVIDEMUX_INSTALL_PREFIX and AVIDEMUX_CORECONFIG_DIR cmake variables,
+  they were poiting to non-existent directories, causing build failures on
+  plugins
 
   01 Sep 2010; Markos Chandras <hwoarang@gentoo.org>
   avidemux-2.5.3-r2.ebuild:
diff --git a/media-video/avidemux/avidemux-2.5.1_p5428.ebuild b/media-video/avidemux/avidemux-2.5.1_p5428.ebuild
index f01c231c994c..f6b6bd60b068 100644
--- a/media-video/avidemux/avidemux-2.5.1_p5428.ebuild
+++ b/media-video/avidemux/avidemux-2.5.1_p5428.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.1_p5428.ebuild,v 1.3 2010/01/09 15:36:42 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.1_p5428.ebuild,v 1.4 2010/09/18 11:06:52 lxnay Exp $
 
 EAPI="2"
 
@@ -47,6 +47,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/cmake-2.6.4"
 
 S=${WORKDIR}/${MY_P}
+BUILD_S=${WORKDIR}/${P}_build
 
 AVIDEMUX_LANGS="bg ca cs de el es fr it ja pt_BR ru sr sr@latin tr zh_TW"
 for L in ${AVIDEMUX_LANGS}; do
@@ -87,8 +88,8 @@ src_prepare() {
 src_configure() {
 	mycmakeargs="${mycmakeargs}
 		-DAVIDEMUX_SOURCE_DIR='${S}'
-		-DAVIDEMUX_INSTALL_PREFIX='${S}_build'
-		-DAVIDEMUX_CORECONFIG_DIR='${S}_build/config'"
+		-DAVIDEMUX_INSTALL_PREFIX='${BUILD_S}'
+		-DAVIDEMUX_CORECONFIG_DIR='${BUILD_S}/config'"
 
 	# CMakeLists.txt
 	use gtk || mycmakeargs="${mycmakeargs} -DGTK=0"
diff --git a/media-video/avidemux/avidemux-2.5.2.ebuild b/media-video/avidemux/avidemux-2.5.2.ebuild
index 3d257cc98209..da8e0895c72c 100644
--- a/media-video/avidemux/avidemux-2.5.2.ebuild
+++ b/media-video/avidemux/avidemux-2.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.2.ebuild,v 1.4 2010/06/18 22:23:43 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.2.ebuild,v 1.5 2010/09/18 11:06:52 lxnay Exp $
 
 EAPI="2"
 
@@ -47,6 +47,7 @@ DEPEND="${RDEPEND}
 	dev-util/cmake"
 
 S=${WORKDIR}/${MY_P}
+BUILD_S=${WORKDIR}/${P}
 
 AVIDEMUX_LANGS="bg ca cs de el es fr it ja pt_BR ru sr sr@latin tr zh_TW"
 for L in ${AVIDEMUX_LANGS}; do
@@ -94,8 +95,8 @@ src_configure() {
 
 	mycmakeargs="${mycmakeargs}
 		-DAVIDEMUX_SOURCE_DIR='${S}'
-		-DAVIDEMUX_INSTALL_PREFIX='${S}_build'
-		-DAVIDEMUX_CORECONFIG_DIR='${S}_build/config'"
+		-DAVIDEMUX_INSTALL_PREFIX='${BUILD_S}'
+		-DAVIDEMUX_CORECONFIG_DIR='${BUILD_S}/config'"
 
 	# CMakeLists.txt
 	use gtk || mycmakeargs="${mycmakeargs} -DGTK=0"
diff --git a/media-video/avidemux/avidemux-2.5.3-r1.ebuild b/media-video/avidemux/avidemux-2.5.3-r1.ebuild
index 725dcc3bfcda..9bfbf8230e91 100644
--- a/media-video/avidemux/avidemux-2.5.3-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.3-r1.ebuild,v 1.1 2010/06/18 13:47:49 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.3-r1.ebuild,v 1.2 2010/09/18 11:06:52 lxnay Exp $
 
 EAPI="2"
 
@@ -46,6 +46,7 @@ DEPEND="${RDEPEND}
 	dev-util/cmake"
 
 S=${WORKDIR}/${MY_P}
+BUILD_S=${WORKDIR}/${P}_build
 
 AVIDEMUX_LANGS="bg ca cs de el es fr it ja pt_BR ru sr sr@latin tr zh_TW"
 for L in ${AVIDEMUX_LANGS}; do
@@ -94,8 +95,8 @@ src_configure() {
 
 	mycmakeargs="${mycmakeargs}
 		-DAVIDEMUX_SOURCE_DIR='${S}'
-		-DAVIDEMUX_INSTALL_PREFIX='${S}_build'
-		-DAVIDEMUX_CORECONFIG_DIR='${S}_build/config'"
+		-DAVIDEMUX_INSTALL_PREFIX='${BUILD_S}'
+		-DAVIDEMUX_CORECONFIG_DIR='${BUILD_S}/config'"
 
 	# CMakeLists.txt
 	use gtk || mycmakeargs="${mycmakeargs} -DGTK=0"
diff --git a/media-video/avidemux/avidemux-2.5.3-r2.ebuild b/media-video/avidemux/avidemux-2.5.3-r2.ebuild
index 5e88c92a4eed..acbfead3ce97 100644
--- a/media-video/avidemux/avidemux-2.5.3-r2.ebuild
+++ b/media-video/avidemux/avidemux-2.5.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.3-r2.ebuild,v 1.4 2010/09/01 23:51:12 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.3-r2.ebuild,v 1.5 2010/09/18 11:06:52 lxnay Exp $
 
 EAPI="2"
 
@@ -46,6 +46,7 @@ DEPEND="${RDEPEND}
 	dev-util/cmake"
 
 S=${WORKDIR}/${MY_P}
+BUILD_S=${WORKDIR}/${P}_build
 
 AVIDEMUX_LANGS="bg ca cs de el es fr it ja pt_BR ru sr sr@latin tr zh_TW"
 for L in ${AVIDEMUX_LANGS}; do
@@ -96,8 +97,8 @@ src_configure() {
 
 	mycmakeargs="${mycmakeargs}
 		-DAVIDEMUX_SOURCE_DIR='${S}'
-		-DAVIDEMUX_INSTALL_PREFIX='${S}_build'
-		-DAVIDEMUX_CORECONFIG_DIR='${S}_build/config'"
+		-DAVIDEMUX_INSTALL_PREFIX='${BUILD_S}'
+		-DAVIDEMUX_CORECONFIG_DIR='${BUILD_S}/config'"
 
 	# CMakeLists.txt
 	use gtk || mycmakeargs="${mycmakeargs} -DGTK=0"