From 697e33ed224b539a42ff68121f7497f5bbf941b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Sun, 14 Jul 2019 08:35:24 +0200
Subject: New upstream version 3.0.5

---
 site_scons/soe_utils.py | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 site_scons/soe_utils.py

(limited to 'site_scons/soe_utils.py')

diff --git a/site_scons/soe_utils.py b/site_scons/soe_utils.py
new file mode 100644
index 0000000..451c7de
--- /dev/null
+++ b/site_scons/soe_utils.py
@@ -0,0 +1,36 @@
+import os.path
+import re
+
+from SCons.Script import Builder, Action, Scanner
+
+def soelim(target, source, env):
+    """
+    Interpolate files included in [gnt]roff source files using the
+    .so directive.
+
+    This behaves somewhat like the soelim(1) wrapper around groff, but
+    makes us independent of whether the actual underlying implementation
+    includes an soelim() command or the corresponding command-line option
+    to groff(1).  The key behavioral difference is that this doesn't
+    recursively include .so files from the include file.  Not yet, anyway.
+    """
+    t = str(target[0])
+    s = str(source[0])
+    dir, f = os.path.split(s)
+    tfp = open(t, 'w')
+    sfp = open(s, 'r')
+    for line in sfp.readlines():
+        if line[:4] in ['.so ', "'so "]:
+            sofile = os.path.join(dir, line[4:-1])
+            tfp.write(open(sofile, 'r').read())
+        else:
+            tfp.write(line)
+    sfp.close()
+    tfp.close()
+
+def soscan(node, env, path):
+    c = node.get_text_contents()
+    return re.compile(r"^[\.']so\s+(\S+)", re.M).findall(c)
+
+soelimbuilder = Builder(action = Action(soelim),
+                        source_scanner = Scanner(soscan))
-- 
cgit v1.2.3


From efdf3fdbcd2f7654cb8d1209a8b040914437bacd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Tue, 23 Jul 2019 16:54:06 +0200
Subject: New upstream version 3.1.0

---
 site_scons/soe_utils.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'site_scons/soe_utils.py')

diff --git a/site_scons/soe_utils.py b/site_scons/soe_utils.py
index 451c7de..3b87dee 100644
--- a/site_scons/soe_utils.py
+++ b/site_scons/soe_utils.py
@@ -17,16 +17,14 @@ def soelim(target, source, env):
     t = str(target[0])
     s = str(source[0])
     dir, f = os.path.split(s)
-    tfp = open(t, 'w')
-    sfp = open(s, 'r')
-    for line in sfp.readlines():
-        if line[:4] in ['.so ', "'so "]:
-            sofile = os.path.join(dir, line[4:-1])
-            tfp.write(open(sofile, 'r').read())
-        else:
-            tfp.write(line)
-    sfp.close()
-    tfp.close()
+    with open(t, 'w') as tfp, open(s, 'r') as sfp:
+        for line in sfp.readlines():
+            if line[:4] in ['.so ', "'so "]:
+                sofile = os.path.join(dir, line[4:-1])
+                with open(sofile, 'r') as f:
+                    tfp.write(f.read())
+            else:
+                tfp.write(line)
 
 def soscan(node, env, path):
     c = node.get_text_contents()
-- 
cgit v1.2.3