From f25989d779f9926a89ad4f7d1b3d39a03e8071e9 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@brief.schottelius.org>
Date: Thu, 25 Oct 2012 18:28:19 +0200
Subject: [PATCH] build MANIFEST ourselves

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
---
 .gitignore  |  3 ++-
 MANIFEST.in |  3 ---
 build       | 57 +++++++++++++++++++++++++++++++++++++++--------------
 3 files changed, 44 insertions(+), 19 deletions(-)
 delete mode 100644 MANIFEST.in

diff --git a/.gitignore b/.gitignore
index fe52a82f..5fc6b0ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,5 +14,6 @@ docs/man/man*/docbook-xsl.css
 # Ignore cdist cache for version control
 /cache/
 
-# Python / cache
+# Python: cache, distutils
 __pycache__/
+MANIFEST
diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index ae20db47..00000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,3 +0,0 @@
-include docs/changelog docs/changelog-2.1
-recursive-include docs/gfx
-recursive-include docs *.mdwn
diff --git a/build b/build
index d3f8ca3a..59bc0b65 100755
--- a/build
+++ b/build
@@ -45,12 +45,37 @@ MAN7DSTDIR=${MANDIR}/man7
 SPEECHESDIR=docs/speeches
 
 case "$1" in
-   man)
-      set -e
-      "$0" mangen
-      "$0" mantype
-      "$0" manbuild
-   ;;
+    man)
+        set -e
+        "$0" mangen
+        "$0" mantype
+        "$0" manbuild
+    ;;
+
+    pypi-manifest)
+        : > MANIFEST
+        # bin
+        echo bin/cdist >> MANIFEST
+        
+        # conf
+        find conf >> MANIFEST
+
+        # docs
+        ls docs/changelog* >> MANIFEST
+        find docs/gfx >> MANIFEST
+        find docs/man/ -name \*.text >> MANIFEST
+        find docs/man/ -name \*.text.sh >> MANIFEST
+
+        # other
+        find other/ >> MANIFEST
+
+
+    ;;
+
+    pypi)
+        $0 pypi-manifest
+        python3 setup.py sdist
+    ;;
 
    manbuild)
       trap abort INT
@@ -133,15 +158,17 @@ case "$1" in
         done
    ;;
 
-   clean)
-      rm -f ${MAN7DSTDIR}/cdist-reference.text
-      find "${MANDIR}" -mindepth 2 -type l \
-         -o -name "*.1" \
-         -o -name "*.7" \
-         -o -name "*.html" \
-         -o -name "*.xml" \
-      | xargs rm -f
-   ;;
+    clean)
+        rm -f ${MAN7DSTDIR}/cdist-reference.text
+        find "${MANDIR}" -mindepth 2 -type l \
+            -o -name "*.1" \
+            -o -name "*.7" \
+            -o -name "*.html" \
+            -o -name "*.xml" \
+        | xargs rm -f
+        
+        find * -name __pycache__  | xargs rm -rf
+    ;;
 
    test)
       shift # skip t