From 5c1c56d54a20207af113cba6daad7ef1251ace4c Mon Sep 17 00:00:00 2001
From: randomdan <randomdan@localhost>
Date: Mon, 19 Aug 2013 17:40:16 +0000
Subject: GCC 4.6 compat fix

---
 www-apps/project2/Manifest            |  2 +-
 www-apps/project2/project2-824.ebuild | 67 -----------------------------------
 www-apps/project2/project2-826.ebuild | 67 +++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+), 68 deletions(-)
 delete mode 100644 www-apps/project2/project2-824.ebuild
 create mode 100644 www-apps/project2/project2-826.ebuild

(limited to 'www-apps')

diff --git a/www-apps/project2/Manifest b/www-apps/project2/Manifest
index fd14dd6..a7edc92 100644
--- a/www-apps/project2/Manifest
+++ b/www-apps/project2/Manifest
@@ -11,4 +11,4 @@ EBUILD project2-781.ebuild 1800 SHA256 ffb6d03a4b1c815fb21ee7bcfd47dcfee0c42ec13
 EBUILD project2-783.ebuild 1800 SHA256 ffb6d03a4b1c815fb21ee7bcfd47dcfee0c42ec13f4cccce4d6be598958eebfc SHA512 32eb9a309dd78cc6134ccdc1aa49d2dcfddbd3f2f6286957732a828455c13fe06d4ce13e19c99c778d7dfb79d990947de32eda52c4813544f442d2cfea0fea85 WHIRLPOOL 09ef35c02ddf4c751095f71bb004b1e838a5590a2291a5b6af39cc5cca95b8c5c04c6e980bf1147b0ef41af7b6a15335754e01f9a60a93c5357560c58c693c1b
 EBUILD project2-796.ebuild 1800 SHA256 ffb6d03a4b1c815fb21ee7bcfd47dcfee0c42ec13f4cccce4d6be598958eebfc SHA512 32eb9a309dd78cc6134ccdc1aa49d2dcfddbd3f2f6286957732a828455c13fe06d4ce13e19c99c778d7dfb79d990947de32eda52c4813544f442d2cfea0fea85 WHIRLPOOL 09ef35c02ddf4c751095f71bb004b1e838a5590a2291a5b6af39cc5cca95b8c5c04c6e980bf1147b0ef41af7b6a15335754e01f9a60a93c5357560c58c693c1b
 EBUILD project2-814.ebuild 1800 SHA256 ffb6d03a4b1c815fb21ee7bcfd47dcfee0c42ec13f4cccce4d6be598958eebfc SHA512 32eb9a309dd78cc6134ccdc1aa49d2dcfddbd3f2f6286957732a828455c13fe06d4ce13e19c99c778d7dfb79d990947de32eda52c4813544f442d2cfea0fea85 WHIRLPOOL 09ef35c02ddf4c751095f71bb004b1e838a5590a2291a5b6af39cc5cca95b8c5c04c6e980bf1147b0ef41af7b6a15335754e01f9a60a93c5357560c58c693c1b
-EBUILD project2-824.ebuild 1800 SHA256 ffb6d03a4b1c815fb21ee7bcfd47dcfee0c42ec13f4cccce4d6be598958eebfc SHA512 32eb9a309dd78cc6134ccdc1aa49d2dcfddbd3f2f6286957732a828455c13fe06d4ce13e19c99c778d7dfb79d990947de32eda52c4813544f442d2cfea0fea85 WHIRLPOOL 09ef35c02ddf4c751095f71bb004b1e838a5590a2291a5b6af39cc5cca95b8c5c04c6e980bf1147b0ef41af7b6a15335754e01f9a60a93c5357560c58c693c1b
+EBUILD project2-826.ebuild 1800 SHA256 ffb6d03a4b1c815fb21ee7bcfd47dcfee0c42ec13f4cccce4d6be598958eebfc SHA512 32eb9a309dd78cc6134ccdc1aa49d2dcfddbd3f2f6286957732a828455c13fe06d4ce13e19c99c778d7dfb79d990947de32eda52c4813544f442d2cfea0fea85 WHIRLPOOL 09ef35c02ddf4c751095f71bb004b1e838a5590a2291a5b6af39cc5cca95b8c5c04c6e980bf1147b0ef41af7b6a15335754e01f9a60a93c5357560c58c693c1b
diff --git a/www-apps/project2/project2-824.ebuild b/www-apps/project2/project2-824.ebuild
deleted file mode 100644
index 11ddaa5..0000000
--- a/www-apps/project2/project2-824.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 && mysql="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-826.ebuild b/www-apps/project2/project2-826.ebuild
new file mode 100644
index 0000000..11ddaa5
--- /dev/null
+++ b/www-apps/project2/project2-826.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 && mysql="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