Improve SYSCONFDIR patch.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

4 files changed, 35 insertions, 12 deletions

diff --git a/net-wireless/gnuradio/ChangeLog b/net-wireless/gnuradio/ChangeLog
index 528a3d8355d5..be754f0b18d0 100644
--- a/net-wireless/gnuradio/ChangeLog
+++ b/net-wireless/gnuradio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/gnuradio
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.8 2012/05/06 12:46:09 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.9 2012/05/06 13:38:45 chithanh Exp $
+
+  06 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  files/gnuradio-3.6.0-cmake-sysconfdir.patch, gnuradio-3.6.0.ebuild:
+  Improve SYSCONFDIR patch.
 
   06 May 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   gnuradio-3.6.0.ebuild:
diff --git a/net-wireless/gnuradio/Manifest b/net-wireless/gnuradio/Manifest
index 940d64e8995e..b84ccef52db3 100644
--- a/net-wireless/gnuradio/Manifest
+++ b/net-wireless/gnuradio/Manifest
@@ -1,7 +1,7 @@
-AUX gnuradio-3.6.0-cmake-sysconfdir.patch 2587 RMD160 d380aa5e42b2447278448a04f2cb5892a934c330 SHA1 2c84f7ca7510a27a7f35e4ffee455e49f2c22ff8 SHA256 feb271e3ca6ec8757701d33cbf233a0299fe1f3740b8e14be1d8e45a941e7b5d
+AUX gnuradio-3.6.0-cmake-sysconfdir.patch 3526 RMD160 2a750aeba2100a99445f3ca1bbaae670ef50830f SHA1 5c2be1b8bcf73c515715cd6a830caea26c3ebecd SHA256 3bc919327e0bb99591cb4ef1d5868dba5b5fe4acb37ecaf81fa7df202e166a2f
 DIST gnuradio-3.5.3.2.tar.gz 4315336 RMD160 b0e0c458987a2609b46abb34a97ef0a5a4aec94a SHA1 8e34539cc677c1cda0980eb949dc16a0bd2ef30f SHA256 e559a07de634de350fcf370daca2c2931231da25370001129de34a2865843f24
 DIST gnuradio-3.6.0.tar.gz 2391734 RMD160 747dff6d0b063b56b277072208573c7b05ee0af4 SHA1 7dfb82924cfff2e3af1dc744561d40a8030b05cc SHA256 17327d9fd03dbbdefe920536e1bad1de0ff80e101846109e0ec2654314f55376
 EBUILD gnuradio-3.5.3.2.ebuild 5129 RMD160 77e0889d7f3d179e39795349d6988b7b33735320 SHA1 0f2146c4dcc131e98a35f74522216f078512bbcd SHA256 92634c4dce508770fed38f2b2d97893c092bac60148cd97a19918fbc8ed6dc88
-EBUILD gnuradio-3.6.0.ebuild 4437 RMD160 916e603ffe9ce8c00007424c5a672273bcb387b0 SHA1 df39168e17d65588b7a68bfde76166ca8c9946cd SHA256 9c4a1deb485dd236656b05324a66d7dfcc86d87619ffd0982edc256df15cc272
-MISC ChangeLog 1513 RMD160 58b6e5f613885572a6c9e164841e0067befa8dc0 SHA1 488588ff9b80bb97e237c6e2a631b52abaa40e69 SHA256 fdfbf359ad0ff1ab01f6c62d204a9f5c82c0d5e5f0421f523b2d65bef7f64eb9
+EBUILD gnuradio-3.6.0.ebuild 4446 RMD160 886e1413da28c51291a1dd5bf2034811784a55af SHA1 b20149c5d38e05f9c4aabec6aba8863537f3c04f SHA256 68b4b2ba28b0c6ae25fd4c60c6d3e7d36b53ba6e7d304efc8ac63d47883addc6
+MISC ChangeLog 1681 RMD160 3e79d958067059861ee57d41b98cbb39390270d5 SHA1 09be361eb93f9045b1ff2efc99f2d491b3b74f4c SHA256 fdfdb950853fb32e32c2fbd431a5acb5cfc034d2a654d5bfd91a572acc86ea7c
 MISC metadata.xml 724 RMD160 68cd95117efb52534b6c8274a2845fa6682052fd SHA1 0aadc1954ad3a85c6b66c15555f01cca084cdaaf SHA256 15516501e6350df82984639fabf5710222e234c8455976ad3560991f9c065923
diff --git a/net-wireless/gnuradio/files/gnuradio-3.6.0-cmake-sysconfdir.patch b/net-wireless/gnuradio/files/gnuradio-3.6.0-cmake-sysconfdir.patch
index 02f94b32d57f..337a356485ca 100644
--- a/net-wireless/gnuradio/files/gnuradio-3.6.0-cmake-sysconfdir.patch
+++ b/net-wireless/gnuradio/files/gnuradio-3.6.0-cmake-sysconfdir.patch
@@ -1,3 +1,24 @@
+diff -ur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2012-04-21 21:00:33.000000000 +0200
++++ b/CMakeLists.txt	2012-05-06 15:22:01.000000000 +0200
+@@ -107,6 +107,8 @@
+ set(GR_LIBEXEC_DIR      libexec)
+ set(GR_PKG_LIBEXEC_DIR  ${GR_LIBEXEC_DIR}/${CMAKE_PROJECT_NAME})
+ set(GRC_BLOCKS_DIR      ${GR_PKG_DATA_DIR}/grc/blocks)
++set(SYSCONFDIR          "${CMAKE_INSTALL_PREFIX}/${GR_CONF_DIR}" CACHE PATH "System configuration directory")
++set(GR_PREFSDIR         ${SYSCONFDIR}/${CMAKE_PROJECT_NAME}/conf.d)
+ 
+ ########################################################################
+ # Variables replaced when configuring the package config files
+@@ -115,6 +117,8 @@
+ file(TO_NATIVE_PATH "\${prefix}"                        exec_prefix)
+ file(TO_NATIVE_PATH "\${exec_prefix}/${GR_LIBRARY_DIR}" libdir)
+ file(TO_NATIVE_PATH "\${prefix}/${GR_INCLUDE_DIR}"      includedir)
++file(TO_NATIVE_PATH "${SYSCONFDIR}"                     SYSCONFDIR)
++file(TO_NATIVE_PATH "${GR_PREFSDIR}"                    GR_PREFSDIR)
+ 
+ ########################################################################
+ # Create uninstall target
 diff -ur a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
 --- a/gnuradio-core/CMakeLists.txt	2012-04-21 21:00:33.000000000 +0200
 +++ b/gnuradio-core/CMakeLists.txt	2012-05-05 20:05:52.000000000 +0200
@@ -12,19 +33,17 @@ diff -ur a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt
  
 diff -ur a/gnuradio-core/src/lib/general/CMakeLists.txt b/gnuradio-core/src/lib/general/CMakeLists.txt
 --- a/gnuradio-core/src/lib/general/CMakeLists.txt	2012-04-21 21:00:33.000000000 +0200
-+++ b/gnuradio-core/src/lib/general/CMakeLists.txt	2012-05-05 21:14:44.000000000 +0200
-@@ -48,8 +48,9 @@
++++ b/gnuradio-core/src/lib/general/CMakeLists.txt	2012-05-06 15:01:12.000000000 +0200
+@@ -48,9 +48,6 @@
  
  message(STATUS "Loading version ${VERSION} into gr_constants...")
  
 -file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/${GR_CONF_DIR}"     SYSCONFDIR)
 -file(TO_NATIVE_PATH "${CMAKE_INSTALL_PREFIX}/${GR_PKG_CONF_DIR}" GR_PREFSDIR)
-+set(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/${GR_CONF_DIR}" CACHE PATH "System configuration directory")
-+file(TO_NATIVE_PATH "${SYSCONFDIR}"     SYSCONFDIR)
-+file(TO_NATIVE_PATH "${SYSCONFDIR}/${CMAKE_PROJECT_NAME}/conf.d" GR_PREFSDIR)
- 
+-
  #double escape for windows backslash path separators
  string(REPLACE "\\" "\\\\" prefix ${prefix})
+ string(REPLACE "\\" "\\\\" SYSCONFDIR ${SYSCONFDIR})
 diff -ur a/gr-audio/lib/CMakeLists.txt b/gr-audio/lib/CMakeLists.txt
 --- a/gr-audio/lib/CMakeLists.txt	2012-04-21 21:00:33.000000000 +0200
 +++ b/gr-audio/lib/CMakeLists.txt	2012-05-05 20:06:08.000000000 +0200
diff --git a/net-wireless/gnuradio/gnuradio-3.6.0.ebuild b/net-wireless/gnuradio/gnuradio-3.6.0.ebuild
index 73cff3ef1f2d..3ae87b7ef374 100644
--- a/net-wireless/gnuradio/gnuradio-3.6.0.ebuild
+++ b/net-wireless/gnuradio/gnuradio-3.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.6.0.ebuild,v 1.2 2012/05/06 12:46:09 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.6.0.ebuild,v 1.3 2012/05/06 13:38:45 chithanh Exp $
 
 EAPI=4
 PYTHON_DEPEND="2"
@@ -61,6 +61,7 @@ DEPEND="${RDEPEND}
 	)
 "
 
+# Add support for custom SYSCONFDIR, upstream bug #492
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.6.0-cmake-sysconfdir.patch
 )
@@ -93,7 +94,6 @@ src_configure() {
 		-DENABLE_GR_CORE=ON
 		-DQWT_INCLUDE_DIRS="${EPREFIX}"/usr/include/qwt5
 		-DSYSCONFDIR="${EPREFIX}"/etc
-		-DGR_PREFSDIR="${EPREFIX}"/etc/${PN}/conf.d
 	)
 	cmake-utils_src_configure
 }