From 3c6f0848bee81bd0b71e49d7051340280bf8c287 Mon Sep 17 00:00:00 2001
From: randomdan <randomdan@localhost>
Date: Wed, 20 Mar 2013 14:14:19 +0000
Subject: Bugfix hack and rollback point

---
 www-apps/project2/Manifest            |  3 +-
 www-apps/project2/project2-779.ebuild | 67 +++++++++++++++++++++++++++++++++++
 www-apps/project2/project2-780.ebuild | 67 -----------------------------------
 www-apps/project2/project2-781.ebuild | 67 +++++++++++++++++++++++++++++++++++
 4 files changed, 136 insertions(+), 68 deletions(-)
 create mode 100644 www-apps/project2/project2-779.ebuild
 delete mode 100644 www-apps/project2/project2-780.ebuild
 create mode 100644 www-apps/project2/project2-781.ebuild

(limited to 'www-apps/project2')

diff --git a/www-apps/project2/Manifest b/www-apps/project2/Manifest
index 171515f..5532f2d 100644
--- a/www-apps/project2/Manifest
+++ b/www-apps/project2/Manifest
@@ -6,4 +6,5 @@ EBUILD project2-762.ebuild 1792 SHA256 46e59c946de1f63aeadf89eeb9a2513196b788942
 EBUILD project2-763.ebuild 1792 SHA256 46e59c946de1f63aeadf89eeb9a2513196b7889420c91c16d6949563a3a7e1f4 SHA512 13ab2c8c1286daca24cf420b012de5640c9bc234f78c878ed43916b67930dbaf3fa5eb1492f13126d00cf66da57ac27c8049837c0b0451133ac02fd021d9fe58 WHIRLPOOL 3b5af7ae111092bf36b7ab1c47928931bac86ff81e86ed689da17f8770801f971270219c26d4aceb7cf644e817c2e5cc02bd0e28d3546d36c49c82608a48ffb9
 EBUILD project2-769.ebuild 1792 SHA256 46e59c946de1f63aeadf89eeb9a2513196b7889420c91c16d6949563a3a7e1f4 SHA512 13ab2c8c1286daca24cf420b012de5640c9bc234f78c878ed43916b67930dbaf3fa5eb1492f13126d00cf66da57ac27c8049837c0b0451133ac02fd021d9fe58 WHIRLPOOL 3b5af7ae111092bf36b7ab1c47928931bac86ff81e86ed689da17f8770801f971270219c26d4aceb7cf644e817c2e5cc02bd0e28d3546d36c49c82608a48ffb9
 EBUILD project2-775.ebuild 1792 SHA256 46e59c946de1f63aeadf89eeb9a2513196b7889420c91c16d6949563a3a7e1f4 SHA512 13ab2c8c1286daca24cf420b012de5640c9bc234f78c878ed43916b67930dbaf3fa5eb1492f13126d00cf66da57ac27c8049837c0b0451133ac02fd021d9fe58 WHIRLPOOL 3b5af7ae111092bf36b7ab1c47928931bac86ff81e86ed689da17f8770801f971270219c26d4aceb7cf644e817c2e5cc02bd0e28d3546d36c49c82608a48ffb9
-EBUILD project2-780.ebuild 1799 SHA256 e1aac2ce75e0894eeabc445da0866d56d07296c3ac20cd8f80d3664c4048d1d0 SHA512 2a2b2a871571f6e2cbfe1a94d152da7a331d9527a802ac9fc1a16d84577aaac2d9dc7fd2ab9b8899bd55f145fab3859c47ffbcde27c6fb8edc1c5e93a1967363 WHIRLPOOL efef457e406a7f06dec6e83836e85050109555cb8192c602027f9a912dbf29738091a0382489653e01530e61605c2971aaa9208166214d80bb3bf07fe0721519
+EBUILD project2-779.ebuild 1799 SHA256 e1aac2ce75e0894eeabc445da0866d56d07296c3ac20cd8f80d3664c4048d1d0 SHA512 2a2b2a871571f6e2cbfe1a94d152da7a331d9527a802ac9fc1a16d84577aaac2d9dc7fd2ab9b8899bd55f145fab3859c47ffbcde27c6fb8edc1c5e93a1967363 WHIRLPOOL efef457e406a7f06dec6e83836e85050109555cb8192c602027f9a912dbf29738091a0382489653e01530e61605c2971aaa9208166214d80bb3bf07fe0721519
+EBUILD project2-781.ebuild 1799 SHA256 e1aac2ce75e0894eeabc445da0866d56d07296c3ac20cd8f80d3664c4048d1d0 SHA512 2a2b2a871571f6e2cbfe1a94d152da7a331d9527a802ac9fc1a16d84577aaac2d9dc7fd2ab9b8899bd55f145fab3859c47ffbcde27c6fb8edc1c5e93a1967363 WHIRLPOOL efef457e406a7f06dec6e83836e85050109555cb8192c602027f9a912dbf29738091a0382489653e01530e61605c2971aaa9208166214d80bb3bf07fe0721519
diff --git a/www-apps/project2/project2-779.ebuild b/www-apps/project2/project2-779.ebuild
new file mode 100644
index 0000000..b070e30
--- /dev/null
+++ b/www-apps/project2/project2-779.ebuild
@@ -0,0 +1,67 @@
+EAPI="3"
+inherit subversion
+
+DESCRIPTION="User configured application engine"
+HOMEPAGE="http://project2.randomdan.homeip.net"
+
+LICENSE="GPL"
+SLOT="0"
+KEYWORDS="x86 amd64"
+IUSE="debug +docs mysql odbc postgres +console +web +fastcgi"
+
+DEPEND="
+	dev-util/boost-build
+	net-libs/libesmtp
+	www-client/lynx
+	>=dev-cpp/libxmlpp-2.36
+	sys-libs/zlib
+	>=sys-devel/gcc-4.5
+	>=dev-cpp/glibmm-2.28
+	>=dev-libs/boost-1.45
+	mysql? ( dev-db/mysql )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( dev-db/postgresql-base )
+	web? (
+			fastcgi? (
+				dev-libs/cgicc
+				virtual/httpd-fastcgi
+				dev-libs/fcgi
+				)
+		 )
+	docs? ( app-doc/doxygen )
+	"
+RDEPEND="${DEPEND}"
+ESVN_REPO_URI="http://svn.randomdan.homeip.net/src/trunk"
+ESVN_REVISION="${PV}"
+use !debug && var="variant=release"
+use !odbc && odbc="odbc=no"
+use !mysql && odbc="mysql=no"
+use !postgres && pq="pq=no"
+use console && bt="$bt p2console" && it="$it installp2con"
+use web && bt="$bt p2cgi" && it="$it installp2cgi"
+use web && use fastcgi && bt="$bt p2fcgi" && it="$it installp2fcgi"
+
+src_prepare() {
+	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
+}
+
+src_compile() {
+	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
+	cd ${S}/project2 || die
+	setarch $(uname -m) -RL \
+			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
+			|| die "Compile failed"
+}
+
+src_install() {
+	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
+	cd ${S}/project2 || die
+	setarch $(uname -m) -RL \
+			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
+			--bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
+			|| die "Installed failed"
+	if use docs ; then
+		mkdir -p ${D}/usr/share/doc/${PN}
+		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
+	fi
+}
diff --git a/www-apps/project2/project2-780.ebuild b/www-apps/project2/project2-780.ebuild
deleted file mode 100644
index b070e30..0000000
--- a/www-apps/project2/project2-780.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-EAPI="3"
-inherit subversion
-
-DESCRIPTION="User configured application engine"
-HOMEPAGE="http://project2.randomdan.homeip.net"
-
-LICENSE="GPL"
-SLOT="0"
-KEYWORDS="x86 amd64"
-IUSE="debug +docs mysql odbc postgres +console +web +fastcgi"
-
-DEPEND="
-	dev-util/boost-build
-	net-libs/libesmtp
-	www-client/lynx
-	>=dev-cpp/libxmlpp-2.36
-	sys-libs/zlib
-	>=sys-devel/gcc-4.5
-	>=dev-cpp/glibmm-2.28
-	>=dev-libs/boost-1.45
-	mysql? ( dev-db/mysql )
-	odbc? ( dev-db/unixODBC )
-	postgres? ( dev-db/postgresql-base )
-	web? (
-			fastcgi? (
-				dev-libs/cgicc
-				virtual/httpd-fastcgi
-				dev-libs/fcgi
-				)
-		 )
-	docs? ( app-doc/doxygen )
-	"
-RDEPEND="${DEPEND}"
-ESVN_REPO_URI="http://svn.randomdan.homeip.net/src/trunk"
-ESVN_REVISION="${PV}"
-use !debug && var="variant=release"
-use !odbc && odbc="odbc=no"
-use !mysql && odbc="mysql=no"
-use !postgres && pq="pq=no"
-use console && bt="$bt p2console" && it="$it installp2con"
-use web && bt="$bt p2cgi" && it="$it installp2cgi"
-use web && use fastcgi && bt="$bt p2fcgi" && it="$it installp2fcgi"
-
-src_prepare() {
-	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
-}
-
-src_compile() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
-			|| die "Compile failed"
-}
-
-src_install() {
-	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
-	cd ${S}/project2 || die
-	setarch $(uname -m) -RL \
-			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
-			--bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
-			|| die "Installed failed"
-	if use docs ; then
-		mkdir -p ${D}/usr/share/doc/${PN}
-		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
-	fi
-}
diff --git a/www-apps/project2/project2-781.ebuild b/www-apps/project2/project2-781.ebuild
new file mode 100644
index 0000000..b070e30
--- /dev/null
+++ b/www-apps/project2/project2-781.ebuild
@@ -0,0 +1,67 @@
+EAPI="3"
+inherit subversion
+
+DESCRIPTION="User configured application engine"
+HOMEPAGE="http://project2.randomdan.homeip.net"
+
+LICENSE="GPL"
+SLOT="0"
+KEYWORDS="x86 amd64"
+IUSE="debug +docs mysql odbc postgres +console +web +fastcgi"
+
+DEPEND="
+	dev-util/boost-build
+	net-libs/libesmtp
+	www-client/lynx
+	>=dev-cpp/libxmlpp-2.36
+	sys-libs/zlib
+	>=sys-devel/gcc-4.5
+	>=dev-cpp/glibmm-2.28
+	>=dev-libs/boost-1.45
+	mysql? ( dev-db/mysql )
+	odbc? ( dev-db/unixODBC )
+	postgres? ( dev-db/postgresql-base )
+	web? (
+			fastcgi? (
+				dev-libs/cgicc
+				virtual/httpd-fastcgi
+				dev-libs/fcgi
+				)
+		 )
+	docs? ( app-doc/doxygen )
+	"
+RDEPEND="${DEPEND}"
+ESVN_REPO_URI="http://svn.randomdan.homeip.net/src/trunk"
+ESVN_REVISION="${PV}"
+use !debug && var="variant=release"
+use !odbc && odbc="odbc=no"
+use !mysql && odbc="mysql=no"
+use !postgres && pq="pq=no"
+use console && bt="$bt p2console" && it="$it installp2con"
+use web && bt="$bt p2cgi" && it="$it installp2cgi"
+use web && use fastcgi && bt="$bt p2fcgi" && it="$it installp2fcgi"
+
+src_prepare() {
+	sed -ie "s|^using gcc .*|using gcc : : : <compileflags>\"${CXXFLAGS}\" <linkflags>\"${LDFLAGS}\" ;|" ${S}/Jamroot.jam
+}
+
+src_compile() {
+	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
+	cd ${S}/project2 || die
+	setarch $(uname -m) -RL \
+			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${bt} -q \
+			|| die "Compile failed"
+}
+
+src_install() {
+	BJAM=`ls -1 /usr/bin/bjam* | tail -1`
+	cd ${S}/project2 || die
+	setarch $(uname -m) -RL \
+			${BJAM} ${BJAMOPTS} ${var} ${odbc} ${mysql} ${pq} ${it} -q \
+			--bindir=${D}/usr/share/webapps/project2 --libdir=${D}/usr/lib \
+			|| die "Installed failed"
+	if use docs ; then
+		mkdir -p ${D}/usr/share/doc/${PN}
+		(cat Doxyfile ; echo OUTPUT_DIRECTORY=${D}/usr/share/doc/${PN}) | doxygen - || die "Build docs failed"
+	fi
+}
-- 
cgit v1.2.3