[gentoo-commits] proj/sci:master commit in: sys-cluster/htcondor/files/

["Justin Lecher" <jlec@gentoo.org>]

commit:     4617cc6a0e736a2d379e38315447e1fff125a0a6
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Fri Jan 23 20:08:01 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jan 23 20:08:01 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4617cc6a

sys-cluster/htcondor: Clean patches according to the CLEAN PATCH HOWTO

http://dev.gentoo.org/~vapier/clean-patches

---
 ...3.2-Apply-the-users-condor_config-last-rather-than-first.patch | 8 ++++++--
 .../htcondor/files/htcondor-8.3.2-condor_config.generic.patch     | 8 ++++++--
 .../htcondor/files/htcondor-8.3.2-packaging_directories.patch     | 8 ++++++--
 sys-cluster/htcondor/files/htcondor-8.3.2-shadow_dlopen.patch     | 7 +++++--
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/sys-cluster/htcondor/files/htcondor-8.3.2-Apply-the-users-condor_config-last-rather-than-first.patch b/sys-cluster/htcondor/files/htcondor-8.3.2-Apply-the-users-condor_config-last-rather-than-first.patch
index bedd7c5..f906ec8 100644
--- a/sys-cluster/htcondor/files/htcondor-8.3.2-Apply-the-users-condor_config-last-rather-than-first.patch
+++ b/sys-cluster/htcondor/files/htcondor-8.3.2-Apply-the-users-condor_config-last-rather-than-first.patch
@@ -1,5 +1,9 @@
---- src/condor_utils/condor_config.cpp	2014-12-23 18:18:42.000000000 +0100
-+++ src/condor_utils/condor_config.cpp	2015-01-11 19:59:17.000000000 +0100
+Apply the users condor_config last, rather than first.
+Ported patch from htcondor-8.0.0 to 8.3.2
+
+Patch by Marius Brehler.
+--- src/condor_utils/condor_config.cpp
++++ src/condor_utils/condor_config.cpp
 @@ -1454,18 +1454,14 @@ find_file(const char *env_name, const ch
  	if (!config_source) {
  			// List of condor_config file locations we'll try to open.

diff --git a/sys-cluster/htcondor/files/htcondor-8.3.2-condor_config.generic.patch b/sys-cluster/htcondor/files/htcondor-8.3.2-condor_config.generic.patch
index 8e8fac9..7b6d337 100644
--- a/sys-cluster/htcondor/files/htcondor-8.3.2-condor_config.generic.patch
+++ b/sys-cluster/htcondor/files/htcondor-8.3.2-condor_config.generic.patch
@@ -1,5 +1,9 @@
---- b/src/condor_examples/condor_config.generic	2015-01-11 19:34:36.000000000 +0100
-+++ a/src/condor_examples/condor_config.generic	2015-01-11 19:38:18.000000000 +0100
+Adjust the generic condor_config to Gentoo's needs.
+Ported patch from htcondor-8.0.0 to 8.3.2
+
+Patch by Marius Brehler.
+--- b/src/condor_examples/condor_config.generic
++++ a/src/condor_examples/condor_config.generic
 @@ -19,7 +19,7 @@
  ######################################################################
  

diff --git a/sys-cluster/htcondor/files/htcondor-8.3.2-packaging_directories.patch b/sys-cluster/htcondor/files/htcondor-8.3.2-packaging_directories.patch
index 3faf0a2..8acd7c7 100644
--- a/sys-cluster/htcondor/files/htcondor-8.3.2-packaging_directories.patch
+++ b/sys-cluster/htcondor/files/htcondor-8.3.2-packaging_directories.patch
@@ -1,5 +1,9 @@
---- b/build/cmake/CondorPackageConfig.cmake	2015-01-11 19:46:05.000000000 +0100
-+++ a/build/cmake/CondorPackageConfig.cmake	2015-01-11 19:47:05.000000000 +0100
+Adjust the package directories.
+Ported patch from htcondor-8.0.0 to 8.3.2
+
+Patch by Marius Brehler.
+--- b/build/cmake/CondorPackageConfig.cmake
++++ a/build/cmake/CondorPackageConfig.cmake
 @@ -406,6 +406,29 @@ elseif( ${OS_NAME} STREQUAL "LINUX" AND
  		set(CMAKE_INSTALL_PREFIX "")
  		set(CPACK_SET_DESTDIR "ON")

diff --git a/sys-cluster/htcondor/files/htcondor-8.3.2-shadow_dlopen.patch b/sys-cluster/htcondor/files/htcondor-8.3.2-shadow_dlopen.patch
index 5709e70..010adbd 100644
--- a/sys-cluster/htcondor/files/htcondor-8.3.2-shadow_dlopen.patch
+++ b/sys-cluster/htcondor/files/htcondor-8.3.2-shadow_dlopen.patch
@@ -1,5 +1,8 @@
---- b/build/cmake/CondorConfigure.cmake	2015-01-11 19:29:57.000000000 +0100
-+++ a/build/cmake/CondorConfigure.cmake	2015-01-11 19:30:40.000000000 +0100
+Ported patch from htcondor-8.0.0 to 8.3.2
+
+Patch by Marius Brehler.
+-- b/build/cmake/CondorConfigure.cmake
++++ a/build/cmake/CondorConfigure.cmake
 @@ -841,7 +841,7 @@ set (CONDOR_LIBS "condor_utils;${RT_FOUN
  set (CONDOR_TOOL_LIBS "condor_utils;${RT_FOUND};${CLASSADS_FOUND};${SECURITY_LIBS};${PCRE_FOUND};${COREDUMPER_FOUND}")
  set (CONDOR_SCRIPT_PERMS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)