Make 3.6 build at least for USE=-binfilter

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

4 files changed, 174 insertions, 3 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index c521b71fff6c..4e283a570b1d 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.337 2012/06/17 10:08:44 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.338 2012/06/17 15:03:07 dilfridge Exp $
+
+  17 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  libreoffice-3.6.9999.ebuild, +files/libreoffice-3.6.9999-parins.patch,
+  libreoffice-9999-r2.ebuild:
+  Make 3.6 build at least for USE=-binfilter
 
   17 Jun 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   libreoffice-3.6.9999.ebuild, libreoffice-9999-r2.ebuild:
diff --git a/app-office/libreoffice/files/libreoffice-3.6.9999-parins.patch b/app-office/libreoffice/files/libreoffice-3.6.9999-parins.patch
new file mode 100644
index 000000000000..4cd238f47b6f
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.6.9999-parins.patch
@@ -0,0 +1,164 @@
+From 93b83cfc04c37ed25450c33b31042d4b58ba88e2 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Sat, 16 Jun 2012 07:19:41 +0200
+Subject: [PATCH] change the way par files for ins are collected
+
+This avoids the need for $(wildcard), which seemed to cause problems in
+some cases (in gentoo ebuild) and I never found any missing dependency
+that might account for it.
+
+Change-Id: Ia03d630bb85309fbb7da3068c396834fb56cffb1
+---
+ solenv/gbuild/InstallModule.mk       |    6 +++---
+ solenv/gbuild/InstallModuleTarget.mk |   12 ++++++------
+ solenv/gbuild/InstallScript.mk       |   17 ++++++++++-------
+ solenv/gbuild/TargetLocations.mk     |    6 ++++--
+ 4 files changed, 23 insertions(+), 18 deletions(-)
+
+diff --git a/solenv/gbuild/InstallModule.mk b/solenv/gbuild/InstallModule.mk
+index f1b9dbe..7ff5a9e 100644
+--- a/solenv/gbuild/InstallModule.mk
++++ b/solenv/gbuild/InstallModule.mk
+@@ -45,7 +45,6 @@ $(call gb_Package_Package_internal,$(1)_par,$(call gb_InstallModuleTarget_get_wo
+ $(call gb_InstallModule_get_target,$(1)) : $(call gb_InstallModuleTarget_get_target,$(1))
+ $(call gb_InstallModule_get_target,$(1)) : $(call gb_Package_get_target,$(1)_par)
+ $(call gb_InstallModule_get_target,$(1)) :| $(dir $(call gb_InstallModule_get_target,$(1))).dir
+-$(call gb_Package_get_preparation_target,$(1)_par) :| $(call gb_InstallModuleTarget_get_target,$(1))
+ $(call gb_InstallModule_get_clean_target,$(1)) : $(call gb_InstallModuleTarget_get_clean_target,$(1))
+ $(call gb_InstallModule_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_par)
+ 
+@@ -89,12 +88,12 @@ $(call gb_InstallModuleTarget_use_packages,$(1),$(2))
+ endef
+ 
+ define gb_InstallModule__add_scpfile_impl
+-$(call gb_Package_add_file,$(1)_par,par/osl/$(2),$(2))
++$(call gb_Package_add_file,$(1)_par,par/osl/$(notdir $(2)),$(2))
+ 
+ endef
+ 
+ define gb_InstallModule__add_scpfile
+-$(call gb_InstallModule__add_scpfile_impl,$(1),$(notdir $(call gb_ScpTarget_get_target,$(2))))
++$(call gb_InstallModule__add_scpfile_impl,$(1),$(dir $(2))$(notdir $(call gb_ScpTarget_get_target,$(2))))
+ 
+ endef
+ 
+@@ -123,6 +122,7 @@ endef
+ 
+ define gb_InstallModule_add_localized_scpfiles
+ $(call gb_InstallModuleTarget_add_localized_scpfiles,$(1),$(2))
++$(call gb_InstallModule__add_scpfiles,$(1),$(2))
+ 
+ endef
+ 
+diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
+index 1b717a7..3d7fcd0 100644
+--- a/solenv/gbuild/InstallModuleTarget.mk
++++ b/solenv/gbuild/InstallModuleTarget.mk
+@@ -265,15 +265,17 @@ endef
+ 
+ define gb_InstallModuleTarget__command
+ $(call gb_Output_announce,$(2),$(true),INM,3)
+-$(foreach scpfile,$(SCP_FILES),$(call gb_Deliver_deliver,$(scpfile),$(3)/$(notdir $(scpfile))) &&) \
+-touch $(1)
++$(call gb_Helper_abbreviate_dirs,\
++	rm -f $(1) \
++	$(foreach scpfile,$(SCP_FILES),&& echo $(scpfile) >> $(1)) \
++)
+ endef
+ 
+ $(dir $(call gb_InstallModuleTarget_get_target,%))%/.dir :
+ 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+ 
+ $(call gb_InstallModuleTarget_get_target,%) :
+-	$(call gb_InstallModuleTarget__command,$@,$*,$(call gb_InstallModuleTarget_get_workdir,$*))
++	$(call gb_InstallModuleTarget__command,$@,$*)
+ 
+ $(call gb_InstallModuleTarget_get_external_target,%) :
+ 	touch $@
+@@ -282,14 +284,12 @@ $(call gb_InstallModuleTarget_get_external_target,%) :
+ $(call gb_InstallModuleTarget_get_clean_target,%) :
+ 	$(call gb_Output_announce,$*,$(false),INM,3)
+ 	rm -rf \
+-		$(call gb_InstallModuleTarget_get_workdir,$*) \
+ 		$(call gb_InstallModuleTarget_get_target,$*) \
+ 		$(call gb_InstallModuleTarget_get_external_target,$*)
+ 
+ define gb_InstallModuleTarget_InstallModuleTarget
+ $(call gb_InstallModuleTarget_get_target,$(1)) :| \
+-	$(call gb_InstallModuleTarget_get_external_target,$(1)) \
+-	$(call gb_InstallModuleTarget_get_workdir,$(1))/.dir
++	$(call gb_InstallModuleTarget_get_external_target,$(1))
+ $(call gb_InstallModuleTarget_get_external_target,$(1)) :| \
+ 	$(dir $(call gb_InstallModuleTarget_get_target,$(1))).dir
+ 
+diff --git a/solenv/gbuild/InstallScript.mk b/solenv/gbuild/InstallScript.mk
+index 506e7b3..35ea142 100644
+--- a/solenv/gbuild/InstallScript.mk
++++ b/solenv/gbuild/InstallScript.mk
+@@ -32,6 +32,10 @@ gb_InstallScriptTarget_COMMAND := $(PERL) $(gb_InstallScriptTarget_TARGET)
+ 
+ gb_InstallScriptTarget__make_arglist = $(subst $(WHITESPACE),$(COMMA),$(strip $(1)))
+ 
++define gb_InstallScriptTarget__get_files
++$(notdir $(shell cat $(foreach module,$(1),$(call gb_InstallModule_get_filelist,$(module)))))
++endef
++
+ # Pass first arg if make is running in silent mode, second arg otherwise
+ define gb_InstallScriptTarget__if_silent
+ $(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),$(1),$(2))
+@@ -42,11 +46,11 @@ $(call gb_Output_announce,$(2),$(true),INS,4)
+ $(call gb_Helper_abbreviate_dirs,\
+ 	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\
+ 		$(call gb_InstallScriptTarget__make_arglist,\
+-			$(notdir $(foreach module,$(SCP_MODULE_DIRS),$(wildcard $(module)/*$(SCP_SUFFIX))))) \
++			$(call gb_InstallScriptTarget__get_files,$(SCP_MODULES))) \
+ 	) && \
+ 	$(gb_InstallScriptTarget_COMMAND) \
+ 		$(call gb_InstallScriptTarget__if_silent,-q) \
+-		-i $(call gb_InstallScriptTarget__make_arglist,$(SCP_MODULE_DIRS) $(OUTDIR)/par) \
++		-i $(OUTDIR)/par/osl \
+ 	   	-o $(1) \
+ 	   	@@$${RESPONSEFILE} && \
+ 	rm -f $${RESPONSEFILE} \
+@@ -70,15 +74,14 @@ $(call gb_InstallScriptTarget_get_clean_target,%) :
+ # gb_InstallScriptTarget_InstallScriptTarget(<target>)
+ define gb_InstallScriptTarget_InstallScriptTarget
+ $(call gb_InstallScriptTarget_get_target,$(1)) :| $(dir $(call gb_InstallScriptTarget_get_target,$(1))).dir
+-$(call gb_InstallScriptTarget_get_target,$(1)) : SCP_MODULE_DIRS :=
+-$(call gb_InstallScriptTarget_get_target,$(1)) : SCP_SUFFIX := $(suffix $(call gb_ScpTarget_get_target,%))
++$(call gb_InstallScriptTarget_get_target,$(1)) : SCP_MODULES :=
+ 
+ endef
+ 
+ define gb_InstallScriptTarget_use_module
+-$(call gb_InstallScriptTarget_get_target,$(1)) : $(call gb_InstallModuleTarget_get_target,$(2))
+-$(call gb_InstallScriptTarget_get_clean_target,$(1)) : $(call gb_InstallModuleTarget_get_clean_target,$(2))
+-$(call gb_InstallScriptTarget_get_target,$(1)) : SCP_MODULE_DIRS += $(call gb_InstallModuleTarget_get_workdir,$(2))
++$(call gb_InstallScriptTarget_get_target,$(1)) : $(call gb_InstallModule_get_target,$(2))
++$(call gb_InstallScriptTarget_get_clean_target,$(1)) : $(call gb_InstallModule_get_clean_target,$(2))
++$(call gb_InstallScriptTarget_get_target,$(1)) : SCP_MODULES += $(2)
+ 
+ endef
+ 
+diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
+index ffd60b4..5a86504 100644
+--- a/solenv/gbuild/TargetLocations.mk
++++ b/solenv/gbuild/TargetLocations.mk
+@@ -94,10 +94,12 @@ gb_Extension_get_workdir = $(WORKDIR)/Extension/$(1)
+ gb_ExternalLib_get_workdir = $(WORKDIR)/ExternalLib/$(1)
+ gb_ExternalLib_get_builddir = $(WORKDIR)/ExternalLib/$(1)/build
+ gb_ExternalLib_get_target = $(WORKDIR)/ExternalLib/$(1).done
++gb_InstallModule_get_filelist = $(call gb_InstallModuleTarget_get_filelist,$(1))
+ gb_InstallModule_get_target = $(WORKDIR)/InstallModule/$(1).done
+ gb_InstallModuleTarget_get_external_target = $(WORKDIR)/InstallModuleTarget/$(1).external
+-gb_InstallModuleTarget_get_target = $(WORKDIR)/InstallModuleTarget/$(1).done
+-gb_InstallModuleTarget_get_workdir = $(WORKDIR)/InstallModuleTarget/$(1)
++gb_InstallModuleTarget_get_filelist = $(WORKDIR)/InstallModuleTarget/$(1).filelist
++gb_InstallModuleTarget_get_target = $(WORKDIR)/InstallModuleTarget/$(1).filelist
++gb_InstallModuleTarget_get_workdir = $(patsubst %/,%,$(dir $(call gb_ScpTarget_get_target,%)))
+ gb_InstallScriptTarget_get_target = $(WORKDIR)/InstallScriptTarget/$(1)$(gb_InstallScript_EXT)
+ gb_Jar_get_target = $(WORKDIR)/Jar/$(1).jar
+ gb_Jar_get_classsetname = Jar/$(1)
+-- 
+1.7.10.2
+
diff --git a/app-office/libreoffice/libreoffice-3.6.9999.ebuild b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
index 7966c0784054..9bab495084e4 100644
--- a/app-office/libreoffice/libreoffice-3.6.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.9999.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/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.5 2012/06/17 10:08:44 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.6 2012/06/17 15:03:07 dilfridge Exp $
 
 EAPI=4
 
@@ -213,6 +213,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-3.6-system-pyuno.patch"
+	"${FILESDIR}/${PN}-3.6.9999-parins.patch"
 )
 
 REQUIRED_USE="
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index ca770365d1e0..a5317e94941d 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.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/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.85 2012/06/17 10:08:44 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.86 2012/06/17 15:03:07 dilfridge Exp $
 
 EAPI=4
 
@@ -215,6 +215,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-3.6-system-pyuno.patch"
+	"${FILESDIR}/${PN}-3.6.9999-parins.patch"
 )
 
 REQUIRED_USE="