ChangeLog: fixing conflicts

10 files changed, 53 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 899a663d62..364e7b3cde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 2007-05-01 Pol Vinogradov <vin.public@gmail.com>
 	* doc/rmagick-doc: new spell, documentation for RMagick
 
+2007-05-01 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
+	* python-devel/feedisto: new spell, rss -> html tool
+	* python-devel/reverend: new spell, needed for feedisto
+
 2007-04-30 Ladislav Hagara <hgr@vabo.cz>
 	* e/expedite: new spell, evas benchmark/test suite
 
@@ -77,6 +81,8 @@
 	* perl-cpan/config-tiny: new spell, Config::Tiny - Read/Write .ini style
 	  files with as little code as possible
 
+=======
+>>>>>>> 5a90497099149604a18c48c8a7cf8ccaca0344c0:ChangeLog
 2007-04-25 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
 	* libs/c-ares: new spell, asynchronous DNS resolver library,
 	  can be used by curl, bzflag, aria2, tor and others
diff --git a/python-devel/feedisto/DEPENDS b/python-devel/feedisto/DEPENDS
new file mode 100755
index 0000000000..57fca20407
--- /dev/null
+++ b/python-devel/feedisto/DEPENDS
@@ -0,0 +1,3 @@
+depends reverend &&
+depends feedparser &&
+depends python 
diff --git a/python-devel/feedisto/DETAILS b/python-devel/feedisto/DETAILS
new file mode 100755
index 0000000000..730b0f89f9
--- /dev/null
+++ b/python-devel/feedisto/DETAILS
@@ -0,0 +1,16 @@
+           SPELL=feedisto
+         VERSION=0.1.1
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+   SOURCE_URL[0]=http://download.berlios.de/${SPELL}/${SOURCE}
+     SOURCE_HASH=sha512:c53caacdc2ab68d32cca34aa1b5d95b8fca058e0387df485677f36fd1e48a684720a44d0c8e675cbb968760d9f771035392d13b8a8d563c13d7c4871255b6338
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="https://feedisto.berlios.de/ "
+      LICENSE[0]=GPL
+         ENTERED=20070430
+           SHORT="A feed reader with plugins and Bayesian filtering."
+cat << EOF
+Feedisto is your personal newspaper. Your newspaper is collected from RSS
+feeds, parsed by a Bayesian filter to rate its relevance, and served as a
+static HTML page or on a Web server to train the filter. Writing plugins is
+very easy.
+EOF
diff --git a/python-devel/feedisto/HISTORY b/python-devel/feedisto/HISTORY
new file mode 100644
index 0000000000..329e30a0fa
--- /dev/null
+++ b/python-devel/feedisto/HISTORY
@@ -0,0 +1,2 @@
+2007-04-30 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
+	* DETAILS, DEPENDS, HISTORY: created spell
diff --git a/python-devel/reverend/DEPENDS b/python-devel/reverend/DEPENDS
new file mode 100755
index 0000000000..6e84a0e417
--- /dev/null
+++ b/python-devel/reverend/DEPENDS
@@ -0,0 +1 @@
+depends python 
diff --git a/python-devel/reverend/DETAILS b/python-devel/reverend/DETAILS
new file mode 100755
index 0000000000..75eb7143d9
--- /dev/null
+++ b/python-devel/reverend/DETAILS
@@ -0,0 +1,14 @@
+           SPELL=reverend
+         VERSION=0.3
+          SOURCE="Reverend-${VERSION}.tar.gz"
+   SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
+     SOURCE_HASH=sha512:d0a00c63fb0604bd671d2e2dee532128d931815020361e9b38ee81f38874e2f693e98c6306d8f0c34277341fec71cc7ed68f21a2a871120c0c961cf7d3981135
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/Reverend-${VERSION}"
+        WEB_SITE="http://www.divmod.org/ "
+      LICENSE[0]=LGPL
+         ENTERED=20070430
+           SHORT="A general purpose Bayesian classifier written in Python."
+cat << EOF
+Reverend is a general purpose Bayesian classifier written in Python. It is
+designed to be easily adapted for your application and is not tied to email.
+EOF
diff --git a/python-devel/reverend/HISTORY b/python-devel/reverend/HISTORY
new file mode 100644
index 0000000000..329e30a0fa
--- /dev/null
+++ b/python-devel/reverend/HISTORY
@@ -0,0 +1,2 @@
+2007-04-30 Andraž "ruskie" Levstik <ruskie@mages.ath.cx>
+	* DETAILS, DEPENDS, HISTORY: created spell
diff --git a/science/yorick/BUILD b/science/yorick/BUILD
index 215ec89ee7..9cf5917bd7 100755
--- a/science/yorick/BUILD
+++ b/science/yorick/BUILD
@@ -1,5 +1,6 @@
-./configure                                             &&
-mkdir -p ${INSTALL_ROOT}/usr/share/yorick               &&
-sed -i -r "s:(Y_SITE=).*:\1/usr/share/yorick:" Make.cfg &&
-sed -i -r "s:(Y_HOME=).*:\1/usr/share/yorick:" Make.cfg &&
+./configure                                                    &&
+sed -i -r "s:(Y_SITE=).*:\1${INSTALL_ROOT}/usr/share/yorick:"  \
+Make.cfg                                                       &&
+sed -i -r "s:(Y_HOME=).*:\1${INSTALL_ROOT}/usr/share/yorick:" \
+Make.cfg                                                       &&
 make
diff --git a/science/yorick/HISTORY b/science/yorick/HISTORY
index 09fcce182e..e949eb3777 100644
--- a/science/yorick/HISTORY
+++ b/science/yorick/HISTORY
@@ -1,4 +1,7 @@
 2007-04-30 Mathieu Lonjaret <lejatorn@sourcemage.org>
+	* BUILD, INSTALL: some missing INSTALL_ROOT
+
+2007-04-30 Mathieu Lonjaret <lejatorn@sourcemage.org>
 	* INSTALL: use TRACK_ROOT when ln -s
 
 2007-04-30 Mathieu Lonjaret <lejatorn@sourcemage.org>
diff --git a/science/yorick/INSTALL b/science/yorick/INSTALL
index 6b0603ff22..6ffd8b8eb9 100755
--- a/science/yorick/INSTALL
+++ b/science/yorick/INSTALL
@@ -1,3 +1,4 @@
+mkdir -p ${INSTALL_ROOT}/usr/share/yorick       &&
 default_install                                 &&
 ln -s ${TRACK_ROOT}/usr/share/yorick/bin/yorick \
 ${INSTALL_ROOT}/usr/bin/yorick                  &&