public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] dev/c1pher:master commit in: www-apps/indefero/, www-apps/indefero/files/
@ 2012-02-01 18:26 Dane Smith
  0 siblings, 0 replies; 10+ messages in thread
From: Dane Smith @ 2012-02-01 18:26 UTC (permalink / raw
  To: gentoo-commits

commit:     627567e7409af40d2f715a05497b287a71e0100a
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  1 18:25:35 2012 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 18:25:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=627567e7

Initial ebuild for indefero.

---
 www-apps/indefero/Manifest                        |    4 ++
 www-apps/indefero/files/indefero-gentoo-pluf.diff |   13 +++++++
 www-apps/indefero/indefero-1.2.ebuild             |   40 +++++++++++++++++++++
 www-apps/indefero/metadata.xml                    |   10 +++++
 4 files changed, 67 insertions(+), 0 deletions(-)

diff --git a/www-apps/indefero/Manifest b/www-apps/indefero/Manifest
new file mode 100644
index 0000000..793c56c
--- /dev/null
+++ b/www-apps/indefero/Manifest
@@ -0,0 +1,4 @@
+AUX indefero-gentoo-pluf.diff 529 RMD160 c7e7ea57ee4b7aa362041a98f3c83f968a4cc01c SHA1 05bc152b1daf436f1b88fd6ee7ccb8498f059a42 SHA256 bda6a9135ec58dec74a6b677577904c566e8001b815712c8160a2c6c29cf7c25
+DIST indefero-1.2.zip 954890 RMD160 3d9272e1f95673ec7c0b9522494f70fe4c3c6af4 SHA1 962b7b542b62b5d9a3ffa4072e0c2f37be8dcbd6 SHA256 f67f542f6f253945d4b5ec7a2b81d842a63aa23200adef1cb2dede3d7bd15ef1
+EBUILD indefero-1.2.ebuild 941 RMD160 d368559084e545964d0f546200ee98c53064f77b SHA1 1ea180bbe08ebaa1db054c89aba6fcbdeb84bbc1 SHA256 ab43a45154d774e66877cacc317b5733af47f6f9ad2c50b21c0c9638242d0638
+MISC metadata.xml 252 RMD160 0d6b4d4e9e2fc0a9fc73289b6f3234195a3a1405 SHA1 6d719654a220ceff01851fa059936c79ca6bf9be SHA256 50fba57de1e11a48fbf58020c096095ebf9ec5defa2b5bcda9ed44e5be159d3f

diff --git a/www-apps/indefero/files/indefero-gentoo-pluf.diff b/www-apps/indefero/files/indefero-gentoo-pluf.diff
new file mode 100644
index 0000000..549260d
--- /dev/null
+++ b/www-apps/indefero/files/indefero-gentoo-pluf.diff
@@ -0,0 +1,13 @@
+diff --git a/src/IDF/conf/path.php-dist b/src/IDF/conf/path.php-dist
+index d8c90ca..9c566e4 100644
+--- a/src/IDF/conf/path.php-dist
++++ b/src/IDF/conf/path.php-dist
+@@ -29,7 +29,7 @@
+  * PLUF_PATH: path to the folder containing the Pluf.php file.
+  * IDF_PATH: path to the folder containing the IDF folder.
+  */
+-define('PLUF_PATH', dirname(__FILE__).'/../../../../pluf/src');
++define('PLUF_PATH', dirname(__FILE__).'/usr/share/php/pluf/');
+ define('IDF_PATH', dirname(__FILE__).'/../..');
+ 
+ set_include_path(get_include_path()

diff --git a/www-apps/indefero/indefero-1.2.ebuild b/www-apps/indefero/indefero-1.2.ebuild
new file mode 100644
index 0000000..f0a1290
--- /dev/null
+++ b/www-apps/indefero/indefero-1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit eutils webapp
+
+DESCRIPTION="An open source Google Code clone"
+HOMEPAGE="http://www.indefero.net/"
+SRC_URI="http://projects.ceondo.com/p/${PN}/downloads/get/${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="app-arch/unzip"
+RDEPEND="${DEPEND}
+	dev-lang/php[gd]
+	dev-php/pluf
+	"
+
+src_prepare(){
+	#Expect pluf to be installed in the normal location.
+	epatch "${FILESDIR}/${PN}-gentoo-pluf.diff"
+}
+
+src_install(){
+	webapp_src_preinst
+	rm COPYING INSTALL.mdtext
+	dodoc doc/* NEWS.mdtext AUTHORS CONTRIBUTE.mdtext
+	rm -rf doc
+	mv src/IDF/conf/idf.php-dist src/IDF/conf/idf.php
+
+	cp -R . "${D}/${MY_HTDOCSDIR}"
+	webapp_configfile "${MY_HTDOCSDIR}/src/IDF/conf/idf.php"
+	#Write a postinstall doc
+	#webapp_postinstall_txt en "${FILESDIR}/postinstall-en-${PV}.txt"
+	webapp_src_install
+}

diff --git a/www-apps/indefero/metadata.xml b/www-apps/indefero/metadata.xml
new file mode 100644
index 0000000..2ba872d
--- /dev/null
+++ b/www-apps/indefero/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>c1pher@gentoo.org</email>
+		<name>Dane Smith</name>
+	</maintainer>
+</pkgmetadata>
+



^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] dev/c1pher:master commit in: www-apps/indefero/, www-apps/indefero/files/
@ 2012-02-01 23:43 Dane Smith
  0 siblings, 0 replies; 10+ messages in thread
From: Dane Smith @ 2012-02-01 23:43 UTC (permalink / raw
  To: gentoo-commits

commit:     558132e16aa2e02df94052c1beec247845facfd8
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  1 23:42:22 2012 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 23:42:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=558132e1

Add bootstrap and some helper scripts for install.

---
 www-apps/indefero/Manifest                     |    5 +++-
 www-apps/indefero/files/bootstrap.php          |   22 ++++++++++++++++++
 www-apps/indefero/files/dbsetup.sh             |    3 ++
 www-apps/indefero/files/postinstall-en-1.2.txt |   29 ++++++++++++++++++++++++
 www-apps/indefero/indefero-1.2.ebuild          |   10 ++++++-
 5 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/www-apps/indefero/Manifest b/www-apps/indefero/Manifest
index b53d41f..a06be5b 100644
--- a/www-apps/indefero/Manifest
+++ b/www-apps/indefero/Manifest
@@ -1,4 +1,7 @@
+AUX bootstrap.php 603 RMD160 4cc6da7db1aeaa2f380458a61f67be651a49abc2 SHA1 4b38c6121046403d805298d18cfb20b7ff807ea0 SHA256 c13948fca2e56b98458f95908c84a4162600a5ee81664e317f0557131ff1c7c9
+AUX dbsetup.sh 87 RMD160 e5f34ac19f55e18ffdf0c5bf2c6c15b359d68582 SHA1 4908e2a65d59a17e6bcd56c12b9e8cf28e316e10 SHA256 fb60f9b35d302898105252d26f3b703a8ec163b5d098a46dfe7ef2305faa2163
 AUX indefero-gentoo-pluf.diff 529 RMD160 c7e7ea57ee4b7aa362041a98f3c83f968a4cc01c SHA1 05bc152b1daf436f1b88fd6ee7ccb8498f059a42 SHA256 bda6a9135ec58dec74a6b677577904c566e8001b815712c8160a2c6c29cf7c25
+AUX postinstall-en-1.2.txt 1103 RMD160 18a78159dd03dff26cdaf92cd1425dd4d7b553fb SHA1 9f1713919c652e58a89f18f2c6929de35c1ff65c SHA256 1b35ddf836be9d7602a2024e80c3e91d6a1f251b8afe7808c115e260445dcf78
 DIST indefero-1.2.zip 954890 RMD160 3d9272e1f95673ec7c0b9522494f70fe4c3c6af4 SHA1 962b7b542b62b5d9a3ffa4072e0c2f37be8dcbd6 SHA256 f67f542f6f253945d4b5ec7a2b81d842a63aa23200adef1cb2dede3d7bd15ef1
-EBUILD indefero-1.2.ebuild 1069 RMD160 067dae059101ff34bab390d0c5456869590ed6ba SHA1 a69b7a465ed02ca5340438bc450d3fd6dbbb9637 SHA256 5f7bfb03e26e6648aaa0f42af28ee7930ab2acdce81871c4301fb6f94be9032c
+EBUILD indefero-1.2.ebuild 1235 RMD160 196fdd7df069415013bb9c947ff7cadfa9cd8e3a SHA1 d8a3c12d6148de93243a71b91a2c3dcbac1efa2f SHA256 2b4a281db69115c437ebde76bca0cfd0a99869d53a6267c8382d146390a75826
 MISC metadata.xml 252 RMD160 0d6b4d4e9e2fc0a9fc73289b6f3234195a3a1405 SHA1 6d719654a220ceff01851fa059936c79ca6bf9be SHA256 50fba57de1e11a48fbf58020c096095ebf9ec5defa2b5bcda9ed44e5be159d3f

diff --git a/www-apps/indefero/files/bootstrap.php b/www-apps/indefero/files/bootstrap.php
new file mode 100644
index 0000000..e1ee96f
--- /dev/null
+++ b/www-apps/indefero/files/bootstrap.php
@@ -0,0 +1,22 @@
+<?php
+set_include_path("/usr/share/php/pluf");
+
+require '/<PATH TO INDEFERO>/src/IDF/conf/path.php';
+require 'Pluf.php';
+
+Pluf::start('/<PATH TO INDEFERO>/src/IDF/conf/idf.php');
+Pluf_Dispatcher::loadControllers(Pluf::f('idf_views'));
+
+$user = new Pluf_User();
+$user->first_name = 'Foo';
+$user->last_name = 'Bar'; // Required!
+$user->login = 'foobar'; // must be lowercase!
+$user->email = 'foo@bar.com';
+$user->password = 'foobarbaz'; // the password is salted/hashed
+// in the database, so do not worry :)
+$user->administrator = true;
+$user->active = true;
+$user->create();
+print "Bootstrap ok\n";
+?>
+

diff --git a/www-apps/indefero/files/dbsetup.sh b/www-apps/indefero/files/dbsetup.sh
new file mode 100755
index 0000000..690f490
--- /dev/null
+++ b/www-apps/indefero/files/dbsetup.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+php /usr/share/php/pluf/src/migrate.php --conf=src/IDF/conf/idf.php -a -d

diff --git a/www-apps/indefero/files/postinstall-en-1.2.txt b/www-apps/indefero/files/postinstall-en-1.2.txt
new file mode 100644
index 0000000..3ceb078
--- /dev/null
+++ b/www-apps/indefero/files/postinstall-en-1.2.txt
@@ -0,0 +1,29 @@
+Setting up Indefero
+===================
+
+1) First, using your database of choice, set up a database, username, and
+passord for Indefero.
+
+ie: If using mysql:
+	1) mysql -u root -h localhost -p
+	2) create user '<username for indefero>'@'localhost' identified by
+	'<password for indefero>';
+	3) create database <database for indefero>;
+	4) grant all on <database for indefero>.* to '<username for
+	indefero>'@'localhost';
+
+2) Depending on where Indefero was installed to (if no USE="vhost" it will be
+under /var/www/localhost/htdocs), edit the file <path to
+indefero>/src/IDF/conf/idf.php . Make sure to use the values for the database
+that you used in step 1.
+
+3) To actually create the needed tables for indefero, cd <path to indefero>
+and run scrips/dbsetup.sh.
+
+4) Lastly, edit <path to indefero>/www/bootstrap.php. Change the places where
+it says <PATH TO INDEFERO> to point to the install you're using. Then update
+it to use a username / password of your choice. Then run php <path to indefero>/www/bootstrap.php.
+When this is done and you see the success, rm <path to
+indefero>/www/bootstrap.php.
+
+

diff --git a/www-apps/indefero/indefero-1.2.ebuild b/www-apps/indefero/indefero-1.2.ebuild
index 5a698a4..20984d6 100644
--- a/www-apps/indefero/indefero-1.2.ebuild
+++ b/www-apps/indefero/indefero-1.2.ebuild
@@ -23,6 +23,8 @@ S="${WORKDIR}/${PN}"
 src_prepare(){
 	#Expect pluf to be installed in the normal location.
 	epatch "${FILESDIR}/${PN}-gentoo-pluf.diff"
+	cp "${FILESDIR}/dbsetup.sh" scripts/
+	cp "${FILESDIR}/bootstrap.php" www/
 }
 
 src_install(){
@@ -36,7 +38,11 @@ src_install(){
 
 	cp -R . "${D}/${MY_HTDOCSDIR}"
 	webapp_configfile "${MY_HTDOCSDIR}/src/IDF/conf/idf.php"
-	#Write a postinstall doc
-	#webapp_postinstall_txt en "${FILESDIR}/postinstall-en-${PV}.txt"
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en-${PV}.txt"
 	webapp_src_install
 }
+
+pkg_postinst(){
+	elog "The postinstall document contains all of the information"
+	elog "needed to get ${PN} running."
+}



^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] dev/c1pher:master commit in: www-apps/indefero/, www-apps/indefero/files/
@ 2012-02-01 23:51 Dane Smith
  0 siblings, 0 replies; 10+ messages in thread
From: Dane Smith @ 2012-02-01 23:51 UTC (permalink / raw
  To: gentoo-commits

commit:     930f6f3f66011d3cf05a0aebce9fd5511c486f80
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  1 23:50:21 2012 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 23:50:21 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=930f6f3f

typo and proper dbsetup

---
 www-apps/indefero/Manifest            |    4 ++--
 www-apps/indefero/files/dbsetup.sh    |    2 +-
 www-apps/indefero/indefero-1.2.ebuild |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/www-apps/indefero/Manifest b/www-apps/indefero/Manifest
index 65bee68..8ff9aab 100644
--- a/www-apps/indefero/Manifest
+++ b/www-apps/indefero/Manifest
@@ -1,7 +1,7 @@
 AUX bootstrap.php 603 RMD160 4cc6da7db1aeaa2f380458a61f67be651a49abc2 SHA1 4b38c6121046403d805298d18cfb20b7ff807ea0 SHA256 c13948fca2e56b98458f95908c84a4162600a5ee81664e317f0557131ff1c7c9
-AUX dbsetup.sh 87 RMD160 e5f34ac19f55e18ffdf0c5bf2c6c15b359d68582 SHA1 4908e2a65d59a17e6bcd56c12b9e8cf28e316e10 SHA256 fb60f9b35d302898105252d26f3b703a8ec163b5d098a46dfe7ef2305faa2163
+AUX dbsetup.sh 90 RMD160 21421b3351cdac9502dec5375101d8439bcd3f4e SHA1 e68086555b66c2957697c9bf93edcb026760e833 SHA256 a2571cd7642e5e6ba678b19269d0704d566e396e01e9ddaead69842d675fe259
 AUX indefero-gentoo-pluf.diff 529 RMD160 c7e7ea57ee4b7aa362041a98f3c83f968a4cc01c SHA1 05bc152b1daf436f1b88fd6ee7ccb8498f059a42 SHA256 bda6a9135ec58dec74a6b677577904c566e8001b815712c8160a2c6c29cf7c25
 AUX postinstall-en-1.2.txt 1103 RMD160 18a78159dd03dff26cdaf92cd1425dd4d7b553fb SHA1 9f1713919c652e58a89f18f2c6929de35c1ff65c SHA256 1b35ddf836be9d7602a2024e80c3e91d6a1f251b8afe7808c115e260445dcf78
 DIST indefero-1.2.zip 954890 RMD160 3d9272e1f95673ec7c0b9522494f70fe4c3c6af4 SHA1 962b7b542b62b5d9a3ffa4072e0c2f37be8dcbd6 SHA256 f67f542f6f253945d4b5ec7a2b81d842a63aa23200adef1cb2dede3d7bd15ef1
-EBUILD indefero-1.2.ebuild 1277 RMD160 c7b36140dd0f534c85ab25a2dd3f37860364276e SHA1 475e2517db2c307cf843a042f94f86cc8e269249 SHA256 30900466b5a29275b618a3071c4afc1c27e01fd44d6fffd31bb2b43ca8d222d6
+EBUILD indefero-1.2.ebuild 1278 RMD160 bcf3bf58f9bbf52965780f1f70eb8b93e3f09724 SHA1 af7c11a54ae17ad1bd29430ead480d0554ecb654 SHA256 319d4347e2d64cdbe489e41d6262f20961166f4fb31f25403173d600f30709e0
 MISC metadata.xml 252 RMD160 0d6b4d4e9e2fc0a9fc73289b6f3234195a3a1405 SHA1 6d719654a220ceff01851fa059936c79ca6bf9be SHA256 50fba57de1e11a48fbf58020c096095ebf9ec5defa2b5bcda9ed44e5be159d3f

diff --git a/www-apps/indefero/files/dbsetup.sh b/www-apps/indefero/files/dbsetup.sh
index 690f490..0d2dd8f 100755
--- a/www-apps/indefero/files/dbsetup.sh
+++ b/www-apps/indefero/files/dbsetup.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-php /usr/share/php/pluf/src/migrate.php --conf=src/IDF/conf/idf.php -a -d
+php /usr/share/php/pluf/src/migrate.php --conf=src/IDF/conf/idf.php -a -i -d

diff --git a/www-apps/indefero/indefero-1.2.ebuild b/www-apps/indefero/indefero-1.2.ebuild
index 9308ead..a018ab5 100644
--- a/www-apps/indefero/indefero-1.2.ebuild
+++ b/www-apps/indefero/indefero-1.2.ebuild
@@ -31,7 +31,7 @@ src_compile(){ :; }
 
 src_install(){
 	webapp_src_preinst
-	rm COPYING INSTALL.mdtext release-scrpt run-tests
+	rm COPYING INSTALL.mdtext release-script run-tests
 	dodoc doc/* NEWS.mdtext AUTHORS CONTRIBUTE.mdtext
 	rm -rf doc NEWS.mdtext AUTHORS CONTRIBUTE.mdtext
 



^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] dev/c1pher:master commit in: www-apps/indefero/, www-apps/indefero/files/
@ 2012-02-01 23:52 Dane Smith
  0 siblings, 0 replies; 10+ messages in thread
From: Dane Smith @ 2012-02-01 23:52 UTC (permalink / raw
  To: gentoo-commits

commit:     d25dfc48149ccbde5bc190ae123ce957804d8bb0
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  1 23:51:51 2012 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 23:51:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=d25dfc48

Proper Pluf path.

---
 www-apps/indefero/Manifest                        |    2 +-
 www-apps/indefero/files/indefero-gentoo-pluf.diff |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/indefero/Manifest b/www-apps/indefero/Manifest
index 8ff9aab..07be628 100644
--- a/www-apps/indefero/Manifest
+++ b/www-apps/indefero/Manifest
@@ -1,6 +1,6 @@
 AUX bootstrap.php 603 RMD160 4cc6da7db1aeaa2f380458a61f67be651a49abc2 SHA1 4b38c6121046403d805298d18cfb20b7ff807ea0 SHA256 c13948fca2e56b98458f95908c84a4162600a5ee81664e317f0557131ff1c7c9
 AUX dbsetup.sh 90 RMD160 21421b3351cdac9502dec5375101d8439bcd3f4e SHA1 e68086555b66c2957697c9bf93edcb026760e833 SHA256 a2571cd7642e5e6ba678b19269d0704d566e396e01e9ddaead69842d675fe259
-AUX indefero-gentoo-pluf.diff 529 RMD160 c7e7ea57ee4b7aa362041a98f3c83f968a4cc01c SHA1 05bc152b1daf436f1b88fd6ee7ccb8498f059a42 SHA256 bda6a9135ec58dec74a6b677577904c566e8001b815712c8160a2c6c29cf7c25
+AUX indefero-gentoo-pluf.diff 511 RMD160 201be20a73ed0897206a6a2a253650e5a708f079 SHA1 cf923b4de6acaa2c4bc9d14b706b4226b73ca612 SHA256 de340e928be33f4301d78b0e7e521f9ec8b6947e40726bd5f872e374f219567b
 AUX postinstall-en-1.2.txt 1103 RMD160 18a78159dd03dff26cdaf92cd1425dd4d7b553fb SHA1 9f1713919c652e58a89f18f2c6929de35c1ff65c SHA256 1b35ddf836be9d7602a2024e80c3e91d6a1f251b8afe7808c115e260445dcf78
 DIST indefero-1.2.zip 954890 RMD160 3d9272e1f95673ec7c0b9522494f70fe4c3c6af4 SHA1 962b7b542b62b5d9a3ffa4072e0c2f37be8dcbd6 SHA256 f67f542f6f253945d4b5ec7a2b81d842a63aa23200adef1cb2dede3d7bd15ef1
 EBUILD indefero-1.2.ebuild 1278 RMD160 bcf3bf58f9bbf52965780f1f70eb8b93e3f09724 SHA1 af7c11a54ae17ad1bd29430ead480d0554ecb654 SHA256 319d4347e2d64cdbe489e41d6262f20961166f4fb31f25403173d600f30709e0

diff --git a/www-apps/indefero/files/indefero-gentoo-pluf.diff b/www-apps/indefero/files/indefero-gentoo-pluf.diff
index 549260d..aa8a152 100644
--- a/www-apps/indefero/files/indefero-gentoo-pluf.diff
+++ b/www-apps/indefero/files/indefero-gentoo-pluf.diff
@@ -7,7 +7,7 @@ index d8c90ca..9c566e4 100644
   * IDF_PATH: path to the folder containing the IDF folder.
   */
 -define('PLUF_PATH', dirname(__FILE__).'/../../../../pluf/src');
-+define('PLUF_PATH', dirname(__FILE__).'/usr/share/php/pluf/');
++define('PLUF_PATH', '/usr/share/php/pluf/');
  define('IDF_PATH', dirname(__FILE__).'/../..');
  
  set_include_path(get_include_path()



^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] dev/c1pher:master commit in: www-apps/indefero/, www-apps/indefero/files/
@ 2012-02-01 23:55 Dane Smith
  0 siblings, 0 replies; 10+ messages in thread
From: Dane Smith @ 2012-02-01 23:55 UTC (permalink / raw
  To: gentoo-commits

commit:     fdd602e17704795d712eb0169b820c92c7d3aa1b
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  1 23:54:24 2012 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 23:54:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=fdd602e1

Wrong filepath

---
 www-apps/indefero/Manifest         |    2 +-
 www-apps/indefero/files/dbsetup.sh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/indefero/Manifest b/www-apps/indefero/Manifest
index 07be628..f9f45f7 100644
--- a/www-apps/indefero/Manifest
+++ b/www-apps/indefero/Manifest
@@ -1,5 +1,5 @@
 AUX bootstrap.php 603 RMD160 4cc6da7db1aeaa2f380458a61f67be651a49abc2 SHA1 4b38c6121046403d805298d18cfb20b7ff807ea0 SHA256 c13948fca2e56b98458f95908c84a4162600a5ee81664e317f0557131ff1c7c9
-AUX dbsetup.sh 90 RMD160 21421b3351cdac9502dec5375101d8439bcd3f4e SHA1 e68086555b66c2957697c9bf93edcb026760e833 SHA256 a2571cd7642e5e6ba678b19269d0704d566e396e01e9ddaead69842d675fe259
+AUX dbsetup.sh 86 RMD160 405e479305710f972bd8c76a23f70618c874903b SHA1 3ddd63a0a260bd49ba3e83c16958e0cd8b0a0b3b SHA256 40f0d1e7763f048cd2171fe73ad051b01918f1fef1c99f5d76e0928676456255
 AUX indefero-gentoo-pluf.diff 511 RMD160 201be20a73ed0897206a6a2a253650e5a708f079 SHA1 cf923b4de6acaa2c4bc9d14b706b4226b73ca612 SHA256 de340e928be33f4301d78b0e7e521f9ec8b6947e40726bd5f872e374f219567b
 AUX postinstall-en-1.2.txt 1103 RMD160 18a78159dd03dff26cdaf92cd1425dd4d7b553fb SHA1 9f1713919c652e58a89f18f2c6929de35c1ff65c SHA256 1b35ddf836be9d7602a2024e80c3e91d6a1f251b8afe7808c115e260445dcf78
 DIST indefero-1.2.zip 954890 RMD160 3d9272e1f95673ec7c0b9522494f70fe4c3c6af4 SHA1 962b7b542b62b5d9a3ffa4072e0c2f37be8dcbd6 SHA256 f67f542f6f253945d4b5ec7a2b81d842a63aa23200adef1cb2dede3d7bd15ef1

diff --git a/www-apps/indefero/files/dbsetup.sh b/www-apps/indefero/files/dbsetup.sh
index 0d2dd8f..d5bf0d1 100755
--- a/www-apps/indefero/files/dbsetup.sh
+++ b/www-apps/indefero/files/dbsetup.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-php /usr/share/php/pluf/src/migrate.php --conf=src/IDF/conf/idf.php -a -i -d
+php /usr/share/php/pluf/migrate.php --conf=src/IDF/conf/idf.php -a -i -d



^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] dev/c1pher:master commit in: www-apps/indefero/, www-apps/indefero/files/
@ 2012-02-01 23:58 Dane Smith
  0 siblings, 0 replies; 10+ messages in thread
From: Dane Smith @ 2012-02-01 23:58 UTC (permalink / raw
  To: gentoo-commits

commit:     75b732cc10552dabce105370a4d50a96ad1b042d
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  1 23:57:26 2012 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 23:57:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=75b732cc

Small tweak to postinst,

---
 www-apps/indefero/Manifest                     |    4 ++--
 www-apps/indefero/files/postinstall-en-1.2.txt |    4 ++--
 www-apps/indefero/indefero-1.2.ebuild          |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/www-apps/indefero/Manifest b/www-apps/indefero/Manifest
index f9f45f7..1f33e36 100644
--- a/www-apps/indefero/Manifest
+++ b/www-apps/indefero/Manifest
@@ -1,7 +1,7 @@
 AUX bootstrap.php 603 RMD160 4cc6da7db1aeaa2f380458a61f67be651a49abc2 SHA1 4b38c6121046403d805298d18cfb20b7ff807ea0 SHA256 c13948fca2e56b98458f95908c84a4162600a5ee81664e317f0557131ff1c7c9
 AUX dbsetup.sh 86 RMD160 405e479305710f972bd8c76a23f70618c874903b SHA1 3ddd63a0a260bd49ba3e83c16958e0cd8b0a0b3b SHA256 40f0d1e7763f048cd2171fe73ad051b01918f1fef1c99f5d76e0928676456255
 AUX indefero-gentoo-pluf.diff 511 RMD160 201be20a73ed0897206a6a2a253650e5a708f079 SHA1 cf923b4de6acaa2c4bc9d14b706b4226b73ca612 SHA256 de340e928be33f4301d78b0e7e521f9ec8b6947e40726bd5f872e374f219567b
-AUX postinstall-en-1.2.txt 1103 RMD160 18a78159dd03dff26cdaf92cd1425dd4d7b553fb SHA1 9f1713919c652e58a89f18f2c6929de35c1ff65c SHA256 1b35ddf836be9d7602a2024e80c3e91d6a1f251b8afe7808c115e260445dcf78
+AUX postinstall-en-1.2.txt 1100 RMD160 aaec96897ca9c3a6333075fbed1b60cc447def52 SHA1 b8ebb42e4b6f183098b7191e54acc652fd7ca56d SHA256 8f1782fe00c04e239ce2c24c0f3a65d9169e580f7a955b5d3898fa795a448f38
 DIST indefero-1.2.zip 954890 RMD160 3d9272e1f95673ec7c0b9522494f70fe4c3c6af4 SHA1 962b7b542b62b5d9a3ffa4072e0c2f37be8dcbd6 SHA256 f67f542f6f253945d4b5ec7a2b81d842a63aa23200adef1cb2dede3d7bd15ef1
-EBUILD indefero-1.2.ebuild 1278 RMD160 bcf3bf58f9bbf52965780f1f70eb8b93e3f09724 SHA1 af7c11a54ae17ad1bd29430ead480d0554ecb654 SHA256 319d4347e2d64cdbe489e41d6262f20961166f4fb31f25403173d600f30709e0
+EBUILD indefero-1.2.ebuild 1274 RMD160 e15a6ae9d9621d23295797525cd33bc4902a129e SHA1 8610b816bff77afaee5f2a8fcbdb09a02e83d27d SHA256 1e94aa8b2d0bcb7b6257f751714b56bf4a58f2e7aa6d6df6103dfbb53d3643e6
 MISC metadata.xml 252 RMD160 0d6b4d4e9e2fc0a9fc73289b6f3234195a3a1405 SHA1 6d719654a220ceff01851fa059936c79ca6bf9be SHA256 50fba57de1e11a48fbf58020c096095ebf9ec5defa2b5bcda9ed44e5be159d3f

diff --git a/www-apps/indefero/files/postinstall-en-1.2.txt b/www-apps/indefero/files/postinstall-en-1.2.txt
index 3ceb078..654468f 100644
--- a/www-apps/indefero/files/postinstall-en-1.2.txt
+++ b/www-apps/indefero/files/postinstall-en-1.2.txt
@@ -17,8 +17,8 @@ under /var/www/localhost/htdocs), edit the file <path to
 indefero>/src/IDF/conf/idf.php . Make sure to use the values for the database
 that you used in step 1.
 
-3) To actually create the needed tables for indefero, cd <path to indefero>
-and run scrips/dbsetup.sh.
+3) To actually create the needed tables for indefero, cd <path to
+indefero>/src and run dbsetup.sh.
 
 4) Lastly, edit <path to indefero>/www/bootstrap.php. Change the places where
 it says <PATH TO INDEFERO> to point to the install you're using. Then update

diff --git a/www-apps/indefero/indefero-1.2.ebuild b/www-apps/indefero/indefero-1.2.ebuild
index a018ab5..07a6501 100644
--- a/www-apps/indefero/indefero-1.2.ebuild
+++ b/www-apps/indefero/indefero-1.2.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${PN}"
 src_prepare(){
 	#Expect pluf to be installed in the normal location.
 	epatch "${FILESDIR}/${PN}-gentoo-pluf.diff"
-	cp "${FILESDIR}/dbsetup.sh" scripts/
+	cp "${FILESDIR}/dbsetup.sh" src/
 	cp "${FILESDIR}/bootstrap.php" www/
 }
 



^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] dev/c1pher:master commit in: www-apps/indefero/, www-apps/indefero/files/
@ 2012-02-01 23:59 Dane Smith
  0 siblings, 0 replies; 10+ messages in thread
From: Dane Smith @ 2012-02-01 23:59 UTC (permalink / raw
  To: gentoo-commits

commit:     b1b6086c98703d0b52a1e6c5ac7d44602a605993
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  1 23:58:40 2012 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 23:58:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=b1b6086c

Fix dbsetup.

---
 www-apps/indefero/Manifest         |    2 +-
 www-apps/indefero/files/dbsetup.sh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-apps/indefero/Manifest b/www-apps/indefero/Manifest
index 1f33e36..8bc9158 100644
--- a/www-apps/indefero/Manifest
+++ b/www-apps/indefero/Manifest
@@ -1,5 +1,5 @@
 AUX bootstrap.php 603 RMD160 4cc6da7db1aeaa2f380458a61f67be651a49abc2 SHA1 4b38c6121046403d805298d18cfb20b7ff807ea0 SHA256 c13948fca2e56b98458f95908c84a4162600a5ee81664e317f0557131ff1c7c9
-AUX dbsetup.sh 86 RMD160 405e479305710f972bd8c76a23f70618c874903b SHA1 3ddd63a0a260bd49ba3e83c16958e0cd8b0a0b3b SHA256 40f0d1e7763f048cd2171fe73ad051b01918f1fef1c99f5d76e0928676456255
+AUX dbsetup.sh 82 RMD160 f47572b05bc754f5842e0d4d7d2dd1406ef06901 SHA1 34ab3646fdb49df946c248f07265d121a383673c SHA256 107f0fcaafe83038bc64588e0bc4b6087a3f0f44c0cff2f29143086d36e290bd
 AUX indefero-gentoo-pluf.diff 511 RMD160 201be20a73ed0897206a6a2a253650e5a708f079 SHA1 cf923b4de6acaa2c4bc9d14b706b4226b73ca612 SHA256 de340e928be33f4301d78b0e7e521f9ec8b6947e40726bd5f872e374f219567b
 AUX postinstall-en-1.2.txt 1100 RMD160 aaec96897ca9c3a6333075fbed1b60cc447def52 SHA1 b8ebb42e4b6f183098b7191e54acc652fd7ca56d SHA256 8f1782fe00c04e239ce2c24c0f3a65d9169e580f7a955b5d3898fa795a448f38
 DIST indefero-1.2.zip 954890 RMD160 3d9272e1f95673ec7c0b9522494f70fe4c3c6af4 SHA1 962b7b542b62b5d9a3ffa4072e0c2f37be8dcbd6 SHA256 f67f542f6f253945d4b5ec7a2b81d842a63aa23200adef1cb2dede3d7bd15ef1

diff --git a/www-apps/indefero/files/dbsetup.sh b/www-apps/indefero/files/dbsetup.sh
index d5bf0d1..695d7cd 100755
--- a/www-apps/indefero/files/dbsetup.sh
+++ b/www-apps/indefero/files/dbsetup.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-php /usr/share/php/pluf/migrate.php --conf=src/IDF/conf/idf.php -a -i -d
+php /usr/share/php/pluf/migrate.php --conf=IDF/conf/idf.php -a -i -d



^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] dev/c1pher:master commit in: www-apps/indefero/, www-apps/indefero/files/
@ 2012-02-03  1:57 Dane Smith
  0 siblings, 0 replies; 10+ messages in thread
From: Dane Smith @ 2012-02-03  1:57 UTC (permalink / raw
  To: gentoo-commits

commit:     95766d1e10daba165bd7301494529cb73ab5a323
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  3 01:56:25 2012 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Fri Feb  3 01:56:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=95766d1e

Cleanup files some and rearrange the install to make more sense.

---
 www-apps/indefero/Manifest                        |    4 +-
 www-apps/indefero/files/indefero-gentoo-pluf.diff |   13 ---------
 www-apps/indefero/files/indefero-gentoo.diff      |   28 +++++++++++++++++++++
 www-apps/indefero/indefero-1.2.ebuild             |   25 +++++++++++-------
 4 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/www-apps/indefero/Manifest b/www-apps/indefero/Manifest
index 3dcb85c..ac213e6 100644
--- a/www-apps/indefero/Manifest
+++ b/www-apps/indefero/Manifest
@@ -1,7 +1,7 @@
 AUX bootstrap.php 603 RMD160 4cc6da7db1aeaa2f380458a61f67be651a49abc2 SHA1 4b38c6121046403d805298d18cfb20b7ff807ea0 SHA256 c13948fca2e56b98458f95908c84a4162600a5ee81664e317f0557131ff1c7c9
 AUX dbsetup.sh 82 RMD160 f47572b05bc754f5842e0d4d7d2dd1406ef06901 SHA1 34ab3646fdb49df946c248f07265d121a383673c SHA256 107f0fcaafe83038bc64588e0bc4b6087a3f0f44c0cff2f29143086d36e290bd
-AUX indefero-gentoo-pluf.diff 511 RMD160 201be20a73ed0897206a6a2a253650e5a708f079 SHA1 cf923b4de6acaa2c4bc9d14b706b4226b73ca612 SHA256 de340e928be33f4301d78b0e7e521f9ec8b6947e40726bd5f872e374f219567b
+AUX indefero-gentoo.diff 1044 RMD160 2cd12655fbab28b5d1c253fbe4f07642484f2cc2 SHA1 a33d542f87085bc0f1bb96b1303b8be341c148bd SHA256 7d6adff939812b17933e050bd525d7958d8de6590e1ed127c2ce69a8e96b670f
 AUX postinstall-en-1.2.txt 1100 RMD160 aaec96897ca9c3a6333075fbed1b60cc447def52 SHA1 b8ebb42e4b6f183098b7191e54acc652fd7ca56d SHA256 8f1782fe00c04e239ce2c24c0f3a65d9169e580f7a955b5d3898fa795a448f38
 DIST indefero-1.2.zip 954890 RMD160 3d9272e1f95673ec7c0b9522494f70fe4c3c6af4 SHA1 962b7b542b62b5d9a3ffa4072e0c2f37be8dcbd6 SHA256 f67f542f6f253945d4b5ec7a2b81d842a63aa23200adef1cb2dede3d7bd15ef1
-EBUILD indefero-1.2.ebuild 1300 RMD160 aad7bbc89ef6c06289db81e2f8ead94c9b5615e9 SHA1 3659ca4658ed1cb22785f43ac6d7348e397f7493 SHA256 6d0d7b0af7285aa642bb4e5c34b695164f23798781629230bd0ff08dc505c437
+EBUILD indefero-1.2.ebuild 1429 RMD160 96d21a1dbc2cba5878c091243b1bce0c12c43c0b SHA1 d4425dcc157fd32e1bb8d158889ad22ac1ebfdb4 SHA256 f23e4a19c73f2a25d1c9a9ab7af25724785856e68878fb9ef32b682610743614
 MISC metadata.xml 252 RMD160 0d6b4d4e9e2fc0a9fc73289b6f3234195a3a1405 SHA1 6d719654a220ceff01851fa059936c79ca6bf9be SHA256 50fba57de1e11a48fbf58020c096095ebf9ec5defa2b5bcda9ed44e5be159d3f

diff --git a/www-apps/indefero/files/indefero-gentoo-pluf.diff b/www-apps/indefero/files/indefero-gentoo-pluf.diff
deleted file mode 100644
index aa8a152..0000000
--- a/www-apps/indefero/files/indefero-gentoo-pluf.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/IDF/conf/path.php-dist b/src/IDF/conf/path.php-dist
-index d8c90ca..9c566e4 100644
---- a/src/IDF/conf/path.php-dist
-+++ b/src/IDF/conf/path.php-dist
-@@ -29,7 +29,7 @@
-  * PLUF_PATH: path to the folder containing the Pluf.php file.
-  * IDF_PATH: path to the folder containing the IDF folder.
-  */
--define('PLUF_PATH', dirname(__FILE__).'/../../../../pluf/src');
-+define('PLUF_PATH', '/usr/share/php/pluf/');
- define('IDF_PATH', dirname(__FILE__).'/../..');
- 
- set_include_path(get_include_path()

diff --git a/www-apps/indefero/files/indefero-gentoo.diff b/www-apps/indefero/files/indefero-gentoo.diff
new file mode 100644
index 0000000..70a41e2
--- /dev/null
+++ b/www-apps/indefero/files/indefero-gentoo.diff
@@ -0,0 +1,28 @@
+diff --git a/www/index.php b/www/index.php
+index a1aebf5..c4229ec 100644
+--- a/www/index.php
++++ b/www/index.php
+@@ -21,8 +21,8 @@
+ #
+ # ***** END LICENSE BLOCK ***** */
+ 
+-require dirname(__FILE__).'/../src/IDF/conf/path.php';
++require dirname(__FILE__).'/src/IDF/conf/path.php';
+ require 'Pluf.php';
+-Pluf::start(dirname(__FILE__).'/../src/IDF/conf/idf.php');
++Pluf::start(dirname(__FILE__).'/src/IDF/conf/idf.php');
+ Pluf_Dispatcher::loadControllers(Pluf::f('idf_views'));
+ Pluf_Dispatcher::dispatch(Pluf_HTTP_URL::getAction()); 
+diff --git a/src/IDF/conf/path.php-dist b/src/IDF/conf/path.php-dist
+index d8c90ca..9c566e4 100644
+--- a/src/IDF/conf/path.php-dist
++++ b/src/IDF/conf/path.php-dist
+@@ -29,7 +29,7 @@
+  * PLUF_PATH: path to the folder containing the Pluf.php file.
+  * IDF_PATH: path to the folder containing the IDF folder.
+  */
+-define('PLUF_PATH', dirname(__FILE__).'/../../../../pluf/src');
++define('PLUF_PATH', '/usr/share/php/pluf/');
+ define('IDF_PATH', dirname(__FILE__).'/../..');
+ 
+ set_include_path(get_include_path()

diff --git a/www-apps/indefero/indefero-1.2.ebuild b/www-apps/indefero/indefero-1.2.ebuild
index 71e058d..fd21fe9 100644
--- a/www-apps/indefero/indefero-1.2.ebuild
+++ b/www-apps/indefero/indefero-1.2.ebuild
@@ -21,31 +21,36 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/${PN}"
 
 src_prepare(){
-	#Expect pluf to be installed in the normal location.
-	epatch "${FILESDIR}/${PN}-gentoo-pluf.diff"
-	cp "${FILESDIR}/dbsetup.sh" src/
-	cp "${FILESDIR}/bootstrap.php" www/
+	#Expect pluf to be installed in the normal location and adjust the index.php
+	#to be where we want it.
+	epatch "${FILESDIR}/${PN}-gentoo.diff"
+	cp "${FILESDIR}/dbsetup.sh" src/ || die
+	cp "${FILESDIR}/bootstrap.php" . || die
+	mv www/* . || die
 }
 
 src_compile(){ :; }
 
 src_install(){
 	webapp_src_preinst
-	rm COPYING INSTALL.mdtext release-script run-tests .gitignore .gitattributes
+	rm COPYING INSTALL.mdtext release-script run-tests .gitignore \
+		.gitattributes Makefile || die
 	dodoc doc/* NEWS.mdtext AUTHORS CONTRIBUTE.mdtext
-	rm -rf doc NEWS.mdtext AUTHORS CONTRIBUTE.mdtext
+	rm -rf test doc NEWS.mdtext AUTHORS CONTRIBUTE.mdtext || die
 
-	mv src/IDF/conf/idf.php-dist src/IDF/conf/idf.php
-	mv src/IDF/conf/path.php-dist src/IDF/conf/path.php
+	mv src/IDF/conf/idf.php-dist src/IDF/conf/idf.php || die
+	mv src/IDF/conf/path.php-dist src/IDF/conf/path.php || die
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -R .
 
-	cp -R . "${D}/${MY_HTDOCSDIR}"
 	webapp_configfile "${MY_HTDOCSDIR}/src/IDF/conf/idf.php"
 	webapp_postinst_txt en "${FILESDIR}/postinstall-en-${PV}.txt"
 	webapp_src_install
 }
 
 pkg_postinst(){
-	webapp_pkg_postinst
 	elog "The postinstall document contains all of the information"
 	elog "needed to get ${PN} running."
+	webapp_pkg_postinst
 }



^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] dev/c1pher:master commit in: www-apps/indefero/, www-apps/indefero/files/
@ 2012-02-03  2:07 Dane Smith
  0 siblings, 0 replies; 10+ messages in thread
From: Dane Smith @ 2012-02-03  2:07 UTC (permalink / raw
  To: gentoo-commits

commit:     2906f2f2731023b946db9f5ea41a4257a0a3f1cd
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  3 02:06:09 2012 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Fri Feb  3 02:06:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=2906f2f2

Update postinstall doc. Cleanup extra cruft

---
 www-apps/indefero/Manifest                     |    4 ++--
 www-apps/indefero/files/postinstall-en-1.2.txt |    6 +++---
 www-apps/indefero/indefero-1.2.ebuild          |    3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/www-apps/indefero/Manifest b/www-apps/indefero/Manifest
index a19d003..73b109e 100644
--- a/www-apps/indefero/Manifest
+++ b/www-apps/indefero/Manifest
@@ -1,7 +1,7 @@
 AUX bootstrap.php 603 RMD160 4cc6da7db1aeaa2f380458a61f67be651a49abc2 SHA1 4b38c6121046403d805298d18cfb20b7ff807ea0 SHA256 c13948fca2e56b98458f95908c84a4162600a5ee81664e317f0557131ff1c7c9
 AUX dbsetup.sh 82 RMD160 f47572b05bc754f5842e0d4d7d2dd1406ef06901 SHA1 34ab3646fdb49df946c248f07265d121a383673c SHA256 107f0fcaafe83038bc64588e0bc4b6087a3f0f44c0cff2f29143086d36e290bd
 AUX indefero-gentoo.diff 1044 RMD160 2cd12655fbab28b5d1c253fbe4f07642484f2cc2 SHA1 a33d542f87085bc0f1bb96b1303b8be341c148bd SHA256 7d6adff939812b17933e050bd525d7958d8de6590e1ed127c2ce69a8e96b670f
-AUX postinstall-en-1.2.txt 1100 RMD160 aaec96897ca9c3a6333075fbed1b60cc447def52 SHA1 b8ebb42e4b6f183098b7191e54acc652fd7ca56d SHA256 8f1782fe00c04e239ce2c24c0f3a65d9169e580f7a955b5d3898fa795a448f38
+AUX postinstall-en-1.2.txt 1088 RMD160 102f2ce5e9ea721d2678106eadd6dcd39a9937c3 SHA1 0b5c896d8ec3c531af1c95c76dcfef8831027e80 SHA256 aef8bdf504b4ef8c39af3af0ac7634ac8f4bb2e850948ec1cdb6b52cd4521560
 DIST indefero-1.2.zip 954890 RMD160 3d9272e1f95673ec7c0b9522494f70fe4c3c6af4 SHA1 962b7b542b62b5d9a3ffa4072e0c2f37be8dcbd6 SHA256 f67f542f6f253945d4b5ec7a2b81d842a63aa23200adef1cb2dede3d7bd15ef1
-EBUILD indefero-1.2.ebuild 1429 RMD160 058bb0520b58c5e1b84b95d914119988f91da0b2 SHA1 daf4ff44aec284e46c4efb676a1fe3b5d25535be SHA256 43e2aef1fa1555071d6e8d13ed14b75debe47819e34f015a447dee030bcdf0f8
+EBUILD indefero-1.2.ebuild 1459 RMD160 bcf2321ff0d38ba8208afcf4f3699941376d102e SHA1 18d99c65a2d1740ebf69df1151508a160d1aef7b SHA256 13d0b847055f938dd7cf793f9982cc47c50b59823cfc0aa1df823777fd45964d
 MISC metadata.xml 252 RMD160 0d6b4d4e9e2fc0a9fc73289b6f3234195a3a1405 SHA1 6d719654a220ceff01851fa059936c79ca6bf9be SHA256 50fba57de1e11a48fbf58020c096095ebf9ec5defa2b5bcda9ed44e5be159d3f

diff --git a/www-apps/indefero/files/postinstall-en-1.2.txt b/www-apps/indefero/files/postinstall-en-1.2.txt
index 654468f..12b1b79 100644
--- a/www-apps/indefero/files/postinstall-en-1.2.txt
+++ b/www-apps/indefero/files/postinstall-en-1.2.txt
@@ -20,10 +20,10 @@ that you used in step 1.
 3) To actually create the needed tables for indefero, cd <path to
 indefero>/src and run dbsetup.sh.
 
-4) Lastly, edit <path to indefero>/www/bootstrap.php. Change the places where
+4) Lastly, edit <path to indefero>/bootstrap.php. Change the places where
 it says <PATH TO INDEFERO> to point to the install you're using. Then update
-it to use a username / password of your choice. Then run php <path to indefero>/www/bootstrap.php.
+it to use a username / password of your choice. Then run php <path to indefero>/bootstrap.php.
 When this is done and you see the success, rm <path to
-indefero>/www/bootstrap.php.
+indefero>/bootstrap.php.
 
 

diff --git a/www-apps/indefero/indefero-1.2.ebuild b/www-apps/indefero/indefero-1.2.ebuild
index ea37844..1cba7eb 100644
--- a/www-apps/indefero/indefero-1.2.ebuild
+++ b/www-apps/indefero/indefero-1.2.ebuild
@@ -27,6 +27,7 @@ src_prepare(){
 	cp "${FILESDIR}/dbsetup.sh" src/ || die
 	cp "${FILESDIR}/bootstrap.php" . || die
 	mv www/* . || die
+	rmdir www || die
 }
 
 src_compile(){ :; }
@@ -34,7 +35,7 @@ src_compile(){ :; }
 src_install(){
 	webapp_src_preinst
 	rm COPYING INSTALL.mdtext release-script run-tests .gitignore \
-		.gitattributes Makefile || die
+		.gitattributes Makefile phpunit.xml || die
 	dodoc doc/* NEWS.mdtext AUTHORS CONTRIBUTE.mdtext
 	rm -rf test doc NEWS.mdtext AUTHORS CONTRIBUTE.mdtext || die
 



^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] dev/c1pher:master commit in: www-apps/indefero/, www-apps/indefero/files/
@ 2012-07-18 15:11 Dane Smith
  0 siblings, 0 replies; 10+ messages in thread
From: Dane Smith @ 2012-07-18 15:11 UTC (permalink / raw
  To: gentoo-commits

commit:     4add08f208614013cec22ff95172752d8511730a
Author:     Dane Smith <c1pher <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 18 15:11:23 2012 +0000
Commit:     Dane Smith <c1pher <AT> gentoo <DOT> org>
CommitDate: Wed Jul 18 15:11:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/c1pher.git;a=commit;h=4add08f2

Rename postinst.

---
 www-apps/indefero/Manifest                         |    6 +++---
 .../{postinstall-en-1.2.txt => postinstall-en.txt} |    0
 www-apps/indefero/indefero-1.2.ebuild              |    2 +-
 www-apps/indefero/indefero-1.3.2.ebuild            |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/www-apps/indefero/Manifest b/www-apps/indefero/Manifest
index 927f07f..427b7ee 100644
--- a/www-apps/indefero/Manifest
+++ b/www-apps/indefero/Manifest
@@ -1,9 +1,9 @@
 AUX bootstrap.php 603 SHA256 c13948fca2e56b98458f95908c84a4162600a5ee81664e317f0557131ff1c7c9 SHA512 641edff7dd0957571401c6082b4a2754fd21c06521eafe654fe4af290447ecaa81b574e4acf4ce312905d8c887f37aea2cffb3a0be0cae2f862b81c391587985 WHIRLPOOL aca45a4dc663eb3000b836f175aefbb4ea7e2e5bbf421ddf99eedcef3422c155fd147f04915ca3be1bd8211e919e29bf1a17052f9c24072265c7f6a9e4f16708
 AUX dbsetup.sh 82 SHA256 107f0fcaafe83038bc64588e0bc4b6087a3f0f44c0cff2f29143086d36e290bd SHA512 be76a0abf0c1882a9d57e18f8d18adb44627a8e343e4f07f7cecee0270633fa9c398a8b23d1d949d7a31f1fca928d8c59d82187745e7fa103595d0dd2dcbfeee WHIRLPOOL 90a489cfe9e53346d51f2de3bf2c0a51f9f69143deb45265a5176dcb4653d5d2a8314e4f207077b93ab2d12cbc02fba93b18cb22ea81fe972e0ea3ae3a486a30
 AUX indefero-gentoo.diff 1044 SHA256 7d6adff939812b17933e050bd525d7958d8de6590e1ed127c2ce69a8e96b670f SHA512 68ee6f8d77a0425edf4ef55c9b4a5721da7afe81523a72e97bc0b90a99e25fbdb3c76577922825ba659a666d07f169ae74690f17ef6bbf548c1a6d7d693a2721 WHIRLPOOL 2405b51addcf0428488976d3de7673ec443911f7856a889b2e578d4dd27d1a86b6f845ae941e70df6e67ff8c741459889f07102115cfbf0a466cd4d8ea3eebad
-AUX postinstall-en-1.2.txt 1088 SHA256 aef8bdf504b4ef8c39af3af0ac7634ac8f4bb2e850948ec1cdb6b52cd4521560 SHA512 3a42cd957730c22dfcd7ceea188000cf8f3be6c5204e14b106cb49cd6dc348d3fdce3049231135b6e696560d1bdf5dd8805c7c09b2a0b0d4dc38dc3c3f933f5f WHIRLPOOL d439f41cc4af4116087230778b88adf13453dbf8a2c404d04c20fba51716e5415b0217b56f69d732dc93f6270f4e7757f9e5b20feeddb2d6c1c282f66328f4a0
+AUX postinstall-en.txt 1088 SHA256 aef8bdf504b4ef8c39af3af0ac7634ac8f4bb2e850948ec1cdb6b52cd4521560 SHA512 3a42cd957730c22dfcd7ceea188000cf8f3be6c5204e14b106cb49cd6dc348d3fdce3049231135b6e696560d1bdf5dd8805c7c09b2a0b0d4dc38dc3c3f933f5f WHIRLPOOL d439f41cc4af4116087230778b88adf13453dbf8a2c404d04c20fba51716e5415b0217b56f69d732dc93f6270f4e7757f9e5b20feeddb2d6c1c282f66328f4a0
 DIST indefero-1.2.zip 954890 SHA256 f67f542f6f253945d4b5ec7a2b81d842a63aa23200adef1cb2dede3d7bd15ef1
 DIST indefero-1.3.2.tar.bz2 515644 SHA256 a0ae515cc7feb38bba7356a38c01013443a129b7c92c3b668288793062051b9f SHA512 b5d14c159ba6b0dedabc51ba4b18dcc672cde68719e7323dc0d8f66abe0cebe26bdb3e18b72e1c0d2f94089d41dfa1d431e30749d401450a043e1198be8defd1 WHIRLPOOL 4a207d6557df972f7ea2ce0611771244b7958369ef5beff5621762418c7ac1924294dd3d8dabb3de8efdf47edb49cc3377f8bbacd5059e0397b7c54477f1f25e
-EBUILD indefero-1.2.ebuild 1531 SHA256 a88101c3dbd7733acbcde5c52ff5f08511e58fc3e13a0b30458616f5f8d76bdb SHA512 ef32b11e972e3fe7c5d0b4eb45d0539a27124459838f10ab5361a05f3ab47622fc76935495179769c9cce4d8f759d1093eeb33908ba929689cf0c3942252647f WHIRLPOOL 2eff423d456c2c08c5edf1b5d4321e841c7e11c59378cf3170a8cb38aebfc9e45971af9cae056eb3843217081724a16f478edc700964960a181853986eab65f3
-EBUILD indefero-1.3.2.ebuild 1535 SHA256 716df11d22a982584f908effbad237992e68d371205da7eebdc111b8619d7d64 SHA512 32397f69113aa033e56591e3bb68604fe5e1d3cfff68cbf4053f7aa06b50615acb3faf4d6e980425b098984d708b2dcd313aa20331ec7e103294a58bffe8eab5 WHIRLPOOL 12c2bde87d377983a36570f4b14c1e4749bf9822fb5ffd2a28aac0a3c8a449e90b3d1143d92054df16a9c67a5d07a2c597700caca94cc53f9e617b19edc42c1b
+EBUILD indefero-1.2.ebuild 1525 SHA256 db1ba6a544418ebd7f3cbcd004f0dc0ee32a438d8513d2f1a1849e10b8b8c9a4 SHA512 a1bc96ff93a5809f07c3aa98eaa436d463e1d5903e1376c0f5cd550c6d0bc637ca0bc6b3778dd053915f1ea1489ff9f87562eeffd8413f393410f28a9a2a230e WHIRLPOOL 32f1834d088d29290ba2153bd74d95dbe8f0578a9d5b0189cb68e10972d4ddacbe6fb3b5e8628bf8faadd4c6c94748e5fa141484081730428815ab15b626941d
+EBUILD indefero-1.3.2.ebuild 1529 SHA256 9442debc12e455f737d650aa6f4e1e1a13af08fe1ee04abcef8aae916a32a8e3 SHA512 b4441b9f2eb9a66fcd025741a802e5b5709f7845b2a095c561aac4e352b3485e085f7e8e2547044793bfaba0b1b526374a6ecbcbadbde043a811c435db791b0b WHIRLPOOL 3a47aaf08cf252bee7a53c62af65ca379d3cc84d7da1726f32c2109e136b70e842f3f66dc660676d907520852d1921373e4bd9eac1eb07f1f41f747fd0ef4e2f
 MISC metadata.xml 252 SHA256 50fba57de1e11a48fbf58020c096095ebf9ec5defa2b5bcda9ed44e5be159d3f SHA512 df21fe7f6dcbd75e26bf8f615809a44012b13f974c739124895f255948c6f689677ae5ec37e6fba550af816fd7ba4de2a6ab29cddb249aa4b59ce8d73484776e WHIRLPOOL e9124b07e0a6841cd4a63cc932f5738ff7b630de140c4634efa47710b1a1b17608ab8b567ae3c1d1267ebb333d1e676e79db0e9eccbe97538acc193d5a09781d

diff --git a/www-apps/indefero/files/postinstall-en-1.2.txt b/www-apps/indefero/files/postinstall-en.txt
similarity index 100%
rename from www-apps/indefero/files/postinstall-en-1.2.txt
rename to www-apps/indefero/files/postinstall-en.txt

diff --git a/www-apps/indefero/indefero-1.2.ebuild b/www-apps/indefero/indefero-1.2.ebuild
index 3c5e5f6..8116319 100644
--- a/www-apps/indefero/indefero-1.2.ebuild
+++ b/www-apps/indefero/indefero-1.2.ebuild
@@ -49,7 +49,7 @@ src_install(){
 	doins -r .
 
 	webapp_configfile "${MY_HTDOCSDIR}/src/IDF/conf/idf.php"
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en-${PV}.txt"
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
 	webapp_src_install
 }
 

diff --git a/www-apps/indefero/indefero-1.3.2.ebuild b/www-apps/indefero/indefero-1.3.2.ebuild
index 54f1d62..ee21f10 100644
--- a/www-apps/indefero/indefero-1.3.2.ebuild
+++ b/www-apps/indefero/indefero-1.3.2.ebuild
@@ -49,7 +49,7 @@ src_install(){
 	doins -r .
 
 	webapp_configfile "${MY_HTDOCSDIR}/src/IDF/conf/idf.php"
-	webapp_postinst_txt en "${FILESDIR}/postinstall-en-${PV}.txt"
+	webapp_postinst_txt en "${FILESDIR}/postinstall-en.txt"
 	webapp_src_install
 }
 



^ permalink raw reply related	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2012-07-18 15:11 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-01 23:51 [gentoo-commits] dev/c1pher:master commit in: www-apps/indefero/, www-apps/indefero/files/ Dane Smith
  -- strict thread matches above, loose matches on Subject: below --
2012-07-18 15:11 Dane Smith
2012-02-03  2:07 Dane Smith
2012-02-03  1:57 Dane Smith
2012-02-01 23:59 Dane Smith
2012-02-01 23:58 Dane Smith
2012-02-01 23:55 Dane Smith
2012-02-01 23:52 Dane Smith
2012-02-01 23:43 Dane Smith
2012-02-01 18:26 Dane Smith

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox