[gentoo-commits] proj/catalyst:pending commit in: /

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     48755c294360bf8e4ef8901f5892b2a29fd60751
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 21:25:26 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sat Feb 22 21:43:18 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=48755c29

Add more working files, directories to .gitignore

---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitignore b/.gitignore
index d52b297..9dc5a73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,8 @@ dist
 build
 files
 MANIFEST
+test*
+*.geany
+outgoing/*
+Scratch/*
+*.patch

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     9e1166fe6c715e8bf26262841798a93a0f00637a
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 16:46:48 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 16:46:48 2017 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9e1166fe

gitignore: anchor the paths

Rather than match any dir/file in the tree, anchor the dist stuff
to the root.

 .gitignore | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index d52b2974..649b79ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *.py[co]
-dist
-build
-files
-MANIFEST
+
+/build/
+/dist/
+/files/
+/MANIFEST

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     24dadb307566c7e7726c74de0fc9141211d4cf51
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 05:17:52 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 05:17:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=24dadb30

Merge branch 'master' of git+ssh://git.gentoo.org/proj/catalyst

 catalyst/base/stagebase.py | 29 ++++++++++++++++-------------
 catalyst/builder.py        |  4 +++-
 2 files changed, 19 insertions(+), 14 deletions(-)

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     1fa12cdb9660d098172b30d955f807d5047adee6
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 17:54:51 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 17:54:51 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1fa12cdb

Merge branch 'master' of git+ssh://git.gentoo.org/proj/catalyst

 catalyst/arch/powerpc.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

[gentoo-commits] proj/catalyst:master commit in: /

[Brian Dolbec]

commit:     8b5d662cdc6926379b74a7bad1988318b5d01085
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 16:07:36 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 21:18:00 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8b5d662c

testpath: Add pyDeComp path

 testpath | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testpath b/testpath
index 6fd9ba9..f4721a4 100644
--- a/testpath
+++ b/testpath
@@ -15,4 +15,4 @@
 # catalyst -c catalyst.conf -p -f stage1.spec
 
 export PATH="$(dirname ${BASH_SOURCE[0]})/bin:${PATH}"
-export PYTHONPATH="$(dirname ${BASH_SOURCE[0]})${PYTHONPATH:+:}${PYTHONPATH}"
+export PYTHONPATH="$(dirname $0)/../pyDeComp/:$(dirname ${BASH_SOURCE[0]})${PYTHONPATH:+:}${PYTHONPATH}"

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     8b5d662cdc6926379b74a7bad1988318b5d01085
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 16:07:36 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun Sep  6 21:18:00 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8b5d662c

testpath: Add pyDeComp path

 testpath | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testpath b/testpath
index 6fd9ba9..f4721a4 100644
--- a/testpath
+++ b/testpath
@@ -15,4 +15,4 @@
 # catalyst -c catalyst.conf -p -f stage1.spec
 
 export PATH="$(dirname ${BASH_SOURCE[0]})/bin:${PATH}"
-export PYTHONPATH="$(dirname ${BASH_SOURCE[0]})${PYTHONPATH:+:}${PYTHONPATH}"
+export PYTHONPATH="$(dirname $0)/../pyDeComp/:$(dirname ${BASH_SOURCE[0]})${PYTHONPATH:+:}${PYTHONPATH}"

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     b97e75598be0ab265fa206d57e4ea918d78cbd38
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 16:07:36 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 15:01:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b97e7559

testpath: Add pyDeComp path

 testpath | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testpath b/testpath
index 6fd9ba9..f4721a4 100644
--- a/testpath
+++ b/testpath
@@ -15,4 +15,4 @@
 # catalyst -c catalyst.conf -p -f stage1.spec
 
 export PATH="$(dirname ${BASH_SOURCE[0]})/bin:${PATH}"
-export PYTHONPATH="$(dirname ${BASH_SOURCE[0]})${PYTHONPATH:+:}${PYTHONPATH}"
+export PYTHONPATH="$(dirname $0)/../pyDeComp/:$(dirname ${BASH_SOURCE[0]})${PYTHONPATH:+:}${PYTHONPATH}"

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     6dc96917b655238e3b02e5c599314cdaa3808758
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 16:07:36 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Sep  1 05:54:11 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6dc96917

testpath: Add pyDeComp path

 testpath | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testpath b/testpath
index 6fd9ba9..f4721a4 100644
--- a/testpath
+++ b/testpath
@@ -15,4 +15,4 @@
 # catalyst -c catalyst.conf -p -f stage1.spec
 
 export PATH="$(dirname ${BASH_SOURCE[0]})/bin:${PATH}"
-export PYTHONPATH="$(dirname ${BASH_SOURCE[0]})${PYTHONPATH:+:}${PYTHONPATH}"
+export PYTHONPATH="$(dirname $0)/../pyDeComp/:$(dirname ${BASH_SOURCE[0]})${PYTHONPATH:+:}${PYTHONPATH}"

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     5d59edb0751072259ee95e9b826780594c42df51
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 16:07:36 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun May 24 16:31:54 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5d59edb0

testpath: Add pyDeComp path

 testpath | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testpath b/testpath
index 6fd9ba9..f4721a4 100644
--- a/testpath
+++ b/testpath
@@ -15,4 +15,4 @@
 # catalyst -c catalyst.conf -p -f stage1.spec
 
 export PATH="$(dirname ${BASH_SOURCE[0]})/bin:${PATH}"
-export PYTHONPATH="$(dirname ${BASH_SOURCE[0]})${PYTHONPATH:+:}${PYTHONPATH}"
+export PYTHONPATH="$(dirname $0)/../pyDeComp/:$(dirname ${BASH_SOURCE[0]})${PYTHONPATH:+:}${PYTHONPATH}"

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     a05ec447e0cabea84cb3263fbf227f8dc77b8595
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 13:47:16 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun May 24 13:47:16 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a05ec447

Add a "she-bang" and fix typo.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>

 testpath | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testpath b/testpath
index 37af9c9..6fd9ba9 100644
--- a/testpath
+++ b/testpath
@@ -1,5 +1,6 @@
+#!/bin/bash
 
-# edit the following 2 paths to point to your catalyst git checkout if nessecary
+# edit the following 2 paths to point to your catalyst git checkout if necessary
 # then in a terminal window you wish to run the git code in...
 # cd ~/catalyst
 # source ./testpath
@@ -14,5 +15,4 @@
 # catalyst -c catalyst.conf -p -f stage1.spec
 
 export PATH="$(dirname ${BASH_SOURCE[0]})/bin:${PATH}"
-
 export PYTHONPATH="$(dirname ${BASH_SOURCE[0]})${PYTHONPATH:+:}${PYTHONPATH}"

[gentoo-commits] proj/catalyst:master commit in: /

[Brian Dolbec]

commit:     380662f1dec5c987a6039b8bc508f9dc0a17f138
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Thu Jun  6 22:32:40 2013 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:38:32 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=380662f1

Makefile: Set PYTHONPATH=. for make_target_table.py

Avoid:

  $ make
  ...
  "./doc/make_target_table.py" > "doc/targets.generated.txt"
  Traceback (most recent call last):
    File "./doc/make_target_table.py", line 34, in <module>
      __import__(module_name)
  ImportError: No module named catalyst.targets.embedded
  make: *** [doc/targets.generated.txt] Error 1

This also ensures that the local catalyst package takes precedence
over any previously installed version.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 57739d5..6f7eb10 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ doc/subarches.generated.txt: $(wildcard catalyst/arch/*.py) doc/make_subarch_tab
 	./doc/make_subarch_table_guidexml.py
 
 doc/targets.generated.txt: doc/make_target_table.py $(wildcard catalyst/targets/*.py)
-	"./$<" > "$@"
+	PYTHONPATH=. "./$<" > "$@"
 
 $(DOCS): files/%.html: doc/%.txt doc/asciidoc.conf Makefile | files
 	a2x --conf-file=doc/asciidoc.conf --attribute="catalystversion=$(PACKAGE_VERSION)" \

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     380662f1dec5c987a6039b8bc508f9dc0a17f138
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Thu Jun  6 22:32:40 2013 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:38:32 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=380662f1

Makefile: Set PYTHONPATH=. for make_target_table.py

Avoid:

  $ make
  ...
  "./doc/make_target_table.py" > "doc/targets.generated.txt"
  Traceback (most recent call last):
    File "./doc/make_target_table.py", line 34, in <module>
      __import__(module_name)
  ImportError: No module named catalyst.targets.embedded
  make: *** [doc/targets.generated.txt] Error 1

This also ensures that the local catalyst package takes precedence
over any previously installed version.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 57739d5..6f7eb10 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ doc/subarches.generated.txt: $(wildcard catalyst/arch/*.py) doc/make_subarch_tab
 	./doc/make_subarch_table_guidexml.py
 
 doc/targets.generated.txt: doc/make_target_table.py $(wildcard catalyst/targets/*.py)
-	"./$<" > "$@"
+	PYTHONPATH=. "./$<" > "$@"
 
 $(DOCS): files/%.html: doc/%.txt doc/asciidoc.conf Makefile | files
 	a2x --conf-file=doc/asciidoc.conf --attribute="catalystversion=$(PACKAGE_VERSION)" \

[gentoo-commits] proj/catalyst:master commit in: /

[Brian Dolbec]

commit:     c0a49affccc4ed2ca39bfcc1df7a84bc439ddeeb
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  7 14:42:27 2013 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:54:54 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=c0a49aff

Streamline data_files generation with additional keys

* Move data_file generation out of setup().
* Return per-directory keys, since distutils only uses the directory
  key and value filename (not the value path) when installing
  data_files.
* Use relative key paths for more flexible installation.
* Raise NotImplementedError if os.path.sep is not '/', which allows
  for simpler path handling.

---
 setup.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index 7a57c54..a412d48 100644
--- a/setup.py
+++ b/setup.py
@@ -41,6 +41,14 @@ def _files(prefix, root):
 		yield (install_directory, file_source_paths)
 
 
+_data_files = [('/etc/catalyst', ['etc/catalyst.conf','etc/catalystrc']),
+	('/usr/share/man/man1', ['files/catalyst.1']),
+	('/usr/share/man/man5', ['files/catalyst-config.5', 'files/catalyst-spec.5'])
+	]
+_data_files.extend(_files('livecd', 'lib/catalyst/'))
+_data_files.extend(_files('targets', 'lib/catalyst/'))
+
+
 _setup(
 	name=_package_name,
 	version=__version__,
@@ -69,12 +77,9 @@ _setup(
 	packages=[
 		_package_name,
 		'{0}.arch'.format(_package_name),
+		'{0}.base'.format(_package_name),
 		'{0}.targets'.format(_package_name),
 		],
-	data_files=list(_itertools.chain(
-		_files(prefix='/etc/catalyst', root='etc'),
-		_files(prefix='lib/catalyst/livecd', root='livecd'),
-		_files(prefix='lib/catalyst/targets', root='targets'),
-		)),
+	data_files=_data_files,
 	provides=[_package_name],
 	)

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     c0a49affccc4ed2ca39bfcc1df7a84bc439ddeeb
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  7 14:42:27 2013 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:54:54 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=c0a49aff

Streamline data_files generation with additional keys

* Move data_file generation out of setup().
* Return per-directory keys, since distutils only uses the directory
  key and value filename (not the value path) when installing
  data_files.
* Use relative key paths for more flexible installation.
* Raise NotImplementedError if os.path.sep is not '/', which allows
  for simpler path handling.

---
 setup.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index 7a57c54..a412d48 100644
--- a/setup.py
+++ b/setup.py
@@ -41,6 +41,14 @@ def _files(prefix, root):
 		yield (install_directory, file_source_paths)
 
 
+_data_files = [('/etc/catalyst', ['etc/catalyst.conf','etc/catalystrc']),
+	('/usr/share/man/man1', ['files/catalyst.1']),
+	('/usr/share/man/man5', ['files/catalyst-config.5', 'files/catalyst-spec.5'])
+	]
+_data_files.extend(_files('livecd', 'lib/catalyst/'))
+_data_files.extend(_files('targets', 'lib/catalyst/'))
+
+
 _setup(
 	name=_package_name,
 	version=__version__,
@@ -69,12 +77,9 @@ _setup(
 	packages=[
 		_package_name,
 		'{0}.arch'.format(_package_name),
+		'{0}.base'.format(_package_name),
 		'{0}.targets'.format(_package_name),
 		],
-	data_files=list(_itertools.chain(
-		_files(prefix='/etc/catalyst', root='etc'),
-		_files(prefix='lib/catalyst/livecd', root='livecd'),
-		_files(prefix='lib/catalyst/targets', root='targets'),
-		)),
+	data_files=_data_files,
 	provides=[_package_name],
 	)

[gentoo-commits] proj/catalyst:master commit in: /

[Brian Dolbec]

commit:     3dea14b7942cd0af70217aba2fae10cca4e4ca4c
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 26 19:54:33 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:54:33 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=3dea14b7

setup.py: Remove unused itertools import

---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index fb49cd6..7a57c54 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,6 @@
 import codecs as _codecs
 from distutils.core import setup as _setup
 from email.utils import parseaddr as _parseaddr
-import itertools as _itertools
 import os as _os
 
 from catalyst import __version__, __maintainer__

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     3dea14b7942cd0af70217aba2fae10cca4e4ca4c
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 26 19:54:33 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:54:33 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=3dea14b7

setup.py: Remove unused itertools import

---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index fb49cd6..7a57c54 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,6 @@
 import codecs as _codecs
 from distutils.core import setup as _setup
 from email.utils import parseaddr as _parseaddr
-import itertools as _itertools
 import os as _os
 
 from catalyst import __version__, __maintainer__

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     e030d4cbe0fb57bde02a7c41b67ce9ef7f613740
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Thu Jun  6 22:05:12 2013 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:37:27 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=e030d4cb

Makefiles: create files directory before populating it

The syntax for the rules is:

  targets ...: target-pattern: prereq-patterns | order-only-prerequisites

For details, see:

http://www.gnu.org/software/make/manual/html_node/Static-Usage.html
http://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html

---
 Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index d2f17f7..57739d5 100644
--- a/Makefile
+++ b/Makefile
@@ -16,13 +16,16 @@ distdir = catalyst-$(PACKAGE_VERSION)
 
 all: $(EXTRA_DIST)
 
-$(MAN_PAGES): files/%: doc/%.txt doc/asciidoc.conf Makefile catalyst
+files:
+	mkdir files
+
+$(MAN_PAGES): files/%: doc/%.txt doc/asciidoc.conf Makefile catalyst | files
 	a2x --conf-file=doc/asciidoc.conf --attribute="catalystversion=$(PACKAGE_VERSION)" \
 		 --format=manpage -D files "$<"
 
 # Additional dependencies due to inclusion
-files/catalyst.1: doc/subarches.generated.txt
-files/catalyst-spec.5: doc/subarches.generated.txt doc/targets.generated.txt
+files/catalyst.1: doc/subarches.generated.txt | files
+files/catalyst-spec.5: doc/subarches.generated.txt doc/targets.generated.txt | files
 
 doc/subarches.generated.txt: $(wildcard catalyst/arch/*.py) doc/make_subarch_table_guidexml.py
 	./doc/make_subarch_table_guidexml.py
@@ -30,7 +33,7 @@ doc/subarches.generated.txt: $(wildcard catalyst/arch/*.py) doc/make_subarch_tab
 doc/targets.generated.txt: doc/make_target_table.py $(wildcard catalyst/targets/*.py)
 	"./$<" > "$@"
 
-$(DOCS): files/%.html: doc/%.txt doc/asciidoc.conf Makefile
+$(DOCS): files/%.html: doc/%.txt doc/asciidoc.conf Makefile | files
 	a2x --conf-file=doc/asciidoc.conf --attribute="catalystversion=$(PACKAGE_VERSION)" \
 		 --format=xhtml -D files "$<"
 

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     15de5ee54bad0a4e2de0f11f6b26bcda0db44269
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Fri Feb  1 01:31:03 2013 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:15:21 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=15de5ee5

Move bug-reporting and mailing list notes from TODO to README

This information is generally useful, and folks probably only read
TODO if they want to help but don't already have an idea of what to
help with ;).  Having the contact information in the README should
raise its visibility.

---
 README | 8 ++++++++
 TODO   | 6 +-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/README b/README
index ef41380..0674e07 100644
--- a/README
+++ b/README
@@ -60,3 +60,11 @@ There are many more options that can be set, but those defaults are good
 for out of the box operation. For more documentation on what you can do
 with catalyst, please check the man page or the online documentation at
 http://www.gentoo.org/proj/en/releng/catalyst.
+
+Bugs
+========================
+
+If you have questions or wish to help with development, contact the
+gentoo-catalyst@lists.gentoo.org mailing list.  Bug reports should be
+filed at http://tinyurl.com/79slrk (http://bugs.gentoo.org) under the
+"Catalyst" component of the "Gentoo Hosted Projects" product.

diff --git a/TODO b/TODO
index bebdec7..a868508 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,6 @@
 # $Id$
 
-This file is a rough list of changes that need to be made to catalyst.  If you
-have questions about any of these items, or wish to help with development, send
-them to the gentoo-catalyst@lists.gentoo.org mailing list.  Bug reports should
-be filed at http://tinyurl.com/79slrk (http://bugs.gentoo.org) under the
-Catalyst component.
+This file is a rough list of changes that need to be made to catalyst.
 
 Global:
 - Remove spec_prefix from all exported variables

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     a1bdd8f6feb6e7b05356d9487e7cf18c36bbf1d9
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 21:25:26 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sun Mar  2 16:07:07 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a1bdd8f6

Add more working files, directories to .gitignore

---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitignore b/.gitignore
index d52b297..9dc5a73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,8 @@ dist
 build
 files
 MANIFEST
+test*
+*.geany
+outgoing/*
+Scratch/*
+*.patch

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     f35597df0a9fe361e8d95fb8d1e53b887c95c96f
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Sat Feb 22 19:37:36 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sat Feb 22 21:43:18 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f35597df

Makefile: Fix PACKAGE_VERSION extraction

The old method grepped for __version__ in catalyst.  That broke with
24c5352 (Initial rearrangement of the python directories, 2013-01-10),
which moved catalyst to bin/catalyst, kept the __version__ in
bin/catalyst, and added a new __version__ in catalyst/main.py.  Then
46b261e (setup.py: Add disutils-based packaging, 2013-06-05)
consolidated the __version__ definitions in catalyst/__init__.py,
removing them from bin/catalyst and catalyst/main.py.  This patch
adjusts the Makefile, invoking Python to extract catalyst.__version__
instead of grepping through the file that defines it.

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 98accbe..757113c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Copyright (C) 2011 Sebastian Pipping <sebastian@pipping.org>
 # Licensed under GPL v2 or later
 
-PACKAGE_VERSION = `fgrep '__version__=' catalyst | sed 's|^__version__="\(.*\)"$$|\1|'`
+PACKAGE_VERSION = $(shell PYTHONPATH=. python -c 'import catalyst; print(catalyst.__version__)')
 MAN_PAGE_SOURCES = $(wildcard doc/*.?.txt)
 MAN_PAGES = $(patsubst doc/%.txt,files/%,$(MAN_PAGE_SOURCES))
 MAN_PAGE_INCLUDES = doc/subarches.generated.txt doc/targets.generated.txt

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     95feb0d5f91d96b29804ab05f56a773743564ec5
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 21:25:26 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sat Feb 22 18:31:52 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=95feb0d5

Add more working files, directories to .gitignore

---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitignore b/.gitignore
index d52b297..9dc5a73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,8 @@ dist
 build
 files
 MANIFEST
+test*
+*.geany
+outgoing/*
+Scratch/*
+*.patch

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     558d0d4a0878913e0bfe1a7b50ca25cd3c4a4580
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 02:54:36 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Feb 11 02:57:36 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=558d0d4a

Update AUTHORS to review credit and split the list of people in original authors, significant contributors and contributors.

---
 AUTHORS | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 2ad8512..3c43706 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,23 +1,26 @@
 # $Id$
 
-This list is split into two alphabetical lists.  The first is a listing of the
-authors of the original Gentoo package.  The copyrights for all of those code
-contributions belong to the Gentoo Foundation.  The second list is the authors
-whom have contributed significant code to the new project.  All code added to
-the new project is copyrighted by the respective authors.
-
-Gentoo Foundation authors:
-------
+The copyright for catalyst is held by the Gentoo Foundation and by each
+of the individual contributors.
+
+
 Original Authors:
+-----------------
 John Davis <zhen@gentoo.org>
 Daniel Robbins <drobbins@gentoo.org>
 
-Additional Maintainers:
-Eric Edgar <rocket@gentoo.org>
+
+Significant contributors (including the first catalyst3 rewrite):
+-----------------------------------------------------------------
 Andrew Gaffney <agaffney@gentoo.org>
-Chris Gianelloni <wolf31o2@gentoo.org>
+Chris Gianelloni <wolf31o2@wolf31o2.org>
+
 
 Contributors:
+-------------
+Eric Edgar <rocket@gentoo.org>
+Andrew Gaffney <agaffney@gentoo.org>
+Chris Gianelloni <wolf31o2@gentoo.org>
 David Bryson <mutex@gentoo.org>
 Mike Frysinger <vapier@gentoo.org>
 Rob Holland <tigger@gentoo.org>
@@ -32,9 +35,10 @@ Matsuu Takuto <matsuu@gentoo.org>
 Lars Weiler <pylon@gentoo.org>
 Gustavo Zacarias <gustavoz@gentoo.org>
 Raúl Porcel <armin76@gentoo.org>
+Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
 
-Copyright authors:
-------
-Andrew Gaffney <agaffney@gentoo.org>
-Chris Gianelloni <wolf31o2@wolf31o2.org>
 
+Maintainers:
+------------
+Catalyst maintainers <catalyst@gentoo.org>
+Release Engineering <releng@gentoo.org>

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     7eb9ce55ecfe74c7846c56cd9f7c38d0ca70ea33
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 11 21:25:26 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sun Jan 12 20:49:46 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=7eb9ce55

Add more working files, directories to .gitignore

---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitignore b/.gitignore
index d52b297..9dc5a73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,8 @@ dist
 build
 files
 MANIFEST
+test*
+*.geany
+outgoing/*
+Scratch/*
+*.patch

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     3c54c1aed1916ab1faca360f37c907f62bd5a414
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 01:42:44 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Jan  3 06:40:03 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=3c54c1ae

update my gitignore

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index 539da74..131b2a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,7 @@
 *.py[co]
+dist/*
+test*
+*.geany
+outgoing/*
+Scratch/*
+*.patch

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     f412fb4e0c879f0dc84b87cd0309f11a3a9a2bc6
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 01:42:44 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Jan  3 05:41:26 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f412fb4e

update my gitignore

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index 539da74..131b2a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,7 @@
 *.py[co]
+dist/*
+test*
+*.geany
+outgoing/*
+Scratch/*
+*.patch

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     494963fd18c65d1f721bcfcbe7b4afc24bcd8561
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 01:42:44 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Jan  3 04:39:29 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=494963fd

update my gitignore

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index 539da74..131b2a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,7 @@
 *.py[co]
+dist/*
+test*
+*.geany
+outgoing/*
+Scratch/*
+*.patch

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     1651d24e34f4dcc4061852525f2416d72fcde61e
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 19 05:04:24 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri Jan  3 04:39:28 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=1651d24e

Add "local_overlay" to configdefaults.

Fixes commit 463d98f
  (modules/generic_stage_target.py: Use a 'local_overlay'
   setting instead of hard-coding '/usr/local/portage',
   2012-12-19)

---
 catalyst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/catalyst b/catalyst
index 4ea4248..82b0942 100755
--- a/catalyst
+++ b/catalyst
@@ -66,6 +66,7 @@ def parse_config(myconfig):
 	confdefaults = {
 		"distdir": "/usr/portage/distfiles",
 		"hash_function": "crc32",
+		"local_overlay": "/usr/local/portage",
 		"options": "",
 		"packagedir": "/usr/portage/packages",
 		"portdir": "/usr/portage",

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     8095090e7c85cf92401130e1a6a55e55701ad1e7
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 01:42:44 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Wed Jan  1 23:55:46 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=8095090e

update my gitignore

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index 539da74..131b2a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,7 @@
 *.py[co]
+dist/*
+test*
+*.geany
+outgoing/*
+Scratch/*
+*.patch

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     ccdf9b2e1c7bbef07b9ec54b7010d542dcf6ac53
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 01:42:44 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Dec 31 17:59:07 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=ccdf9b2e

update my gitignore

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index 539da74..131b2a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,7 @@
 *.py[co]
+dist/*
+test*
+*.geany
+outgoing/*
+Scratch/*
+*.patch

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     9b6c6c6a4e611ce884122b34a201af0ef3ccd396
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 01:42:44 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Dec 31 04:40:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9b6c6c6a

update my gitignore

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index 539da74..131b2a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,7 @@
 *.py[co]
+dist/*
+test*
+*.geany
+outgoing/*
+Scratch/*
+*.patch

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     abf70c433880bcffe16dcac702391d28d9f35524
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 01:42:44 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Dec 31 04:33:36 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=abf70c43

update my gitignore

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index 539da74..131b2a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,7 @@
 *.py[co]
+dist/*
+test*
+*.geany
+outgoing/*
+Scratch/*
+*.patch

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     ad2e98f6ed853f683b30d35878cfdad58e453181
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 19 05:04:24 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Dec 31 04:33:35 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=ad2e98f6

Add "local_overlay" to configdefaults.

Fixes commit 463d98f
  (modules/generic_stage_target.py: Use a 'local_overlay'
   setting instead of hard-coding '/usr/local/portage',
   2012-12-19)

---
 catalyst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/catalyst b/catalyst
index 4ea4248..82b0942 100755
--- a/catalyst
+++ b/catalyst
@@ -66,6 +66,7 @@ def parse_config(myconfig):
 	confdefaults = {
 		"distdir": "/usr/portage/distfiles",
 		"hash_function": "crc32",
+		"local_overlay": "/usr/local/portage",
 		"options": "",
 		"packagedir": "/usr/portage/packages",
 		"portdir": "/usr/portage",

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     f2a70eac8e4cbc325323fa00a93bfb8c7a472cd6
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 01:42:44 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Dec 31 03:58:32 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f2a70eac

update my gitignore

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index 539da74..131b2a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,7 @@
 *.py[co]
+dist/*
+test*
+*.geany
+outgoing/*
+Scratch/*
+*.patch

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     6613a60609c0c25c92eedc969c67a0835fba03e5
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 19 05:04:24 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Dec 31 00:39:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=6613a606

Add "local_overlay" to configdefaults.

Fixes commit 463d98f
  (modules/generic_stage_target.py: Use a 'local_overlay'
   setting instead of hard-coding '/usr/local/portage',
   2012-12-19)

---
 catalyst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/catalyst b/catalyst
index 4ea4248..82b0942 100755
--- a/catalyst
+++ b/catalyst
@@ -66,6 +66,7 @@ def parse_config(myconfig):
 	confdefaults = {
 		"distdir": "/usr/portage/distfiles",
 		"hash_function": "crc32",
+		"local_overlay": "/usr/local/portage",
 		"options": "",
 		"packagedir": "/usr/portage/packages",
 		"portdir": "/usr/portage",

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     dde42958844471e1779b349762d06c9d59399fda
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 01:42:44 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Dec 30 01:42:44 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=dde42958

update my gitignore

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index 539da74..131b2a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,7 @@
 *.py[co]
+dist/*
+test*
+*.geany
+outgoing/*
+Scratch/*
+*.patch

[gentoo-commits] proj/catalyst:pending commit in: /

[Brian Dolbec]

commit:     df740c5114710d935a69bb7dacadd60f3db6a269
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 19 05:04:24 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sun Dec 29 18:54:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=df740c51

Fixes commit 463d98f (modules/generic_stage_target.py: Use a
  'local_overlay' setting instead of hard-coding '/usr/local/portage',
  2012-12-19).Add "local_overlay" to configdefaults.

---
 catalyst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/catalyst b/catalyst
index 4ea4248..82b0942 100755
--- a/catalyst
+++ b/catalyst
@@ -66,6 +66,7 @@ def parse_config(myconfig):
 	confdefaults = {
 		"distdir": "/usr/portage/distfiles",
 		"hash_function": "crc32",
+		"local_overlay": "/usr/local/portage",
 		"options": "",
 		"packagedir": "/usr/portage/packages",
 		"portdir": "/usr/portage",