From 95f81188d64a7480e9e489a6264dd630087d3e1f Mon Sep 17 00:00:00 2001 From: randomdan Date: Mon, 4 Jun 2012 02:38:27 +0000 Subject: Minor tweaks and gcc warnings fix --- www-apps/project2/Manifest | 2 +- www-apps/project2/project2-721.ebuild | 66 ----------------------------------- www-apps/project2/project2-725.ebuild | 66 +++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 67 deletions(-) delete mode 100644 www-apps/project2/project2-721.ebuild create mode 100644 www-apps/project2/project2-725.ebuild (limited to 'www-apps') diff --git a/www-apps/project2/Manifest b/www-apps/project2/Manifest index 2a12de4..79dda79 100644 --- a/www-apps/project2/Manifest +++ b/www-apps/project2/Manifest @@ -1,4 +1,4 @@ EBUILD project2-686.ebuild 1705 RMD160 c67c4e2d180d03f5c739f3da70abb1b1d91d98e7 SHA1 60deb749f6a6772e69a89f48932c5cad70c73c67 SHA256 7bf6bd2c85fe01a8e21660ec79dd1c1438dd363e2949d2488bfbb490fbef0cce EBUILD project2-691.ebuild 1720 RMD160 d0262376ffc9e796ceafc51426ae7270538d8a20 SHA1 1d5609e8f5ae4e8eec491be569b8082139e9a61d SHA256 485a2416887dacd574f76db3b14c0f4729510e2795bf59587222abd634aacc95 EBUILD project2-695.ebuild 1729 RMD160 637d0e5ed232aac8e185f5dd252884fb1bb030ec SHA1 3557520d43ab296567d39acd86f6abd921e2fa70 SHA256 3523333b5ee667beb13d6431a689943b1e887e35fe5d2fc3b300b06c05a011f9 -EBUILD project2-721.ebuild 1741 RMD160 69f37b487a20ce30ad8ff3b6b7ef9e9fa36970d0 SHA1 44c081a85de2af7d05c6c5abbfce240127d73b0b SHA256 a1ed319484071866a07c3a93f5e2a5488b57dd4889c34d5f9c63f5477e0e059d +EBUILD project2-725.ebuild 1741 RMD160 69f37b487a20ce30ad8ff3b6b7ef9e9fa36970d0 SHA1 44c081a85de2af7d05c6c5abbfce240127d73b0b SHA256 a1ed319484071866a07c3a93f5e2a5488b57dd4889c34d5f9c63f5477e0e059d diff --git a/www-apps/project2/project2-721.ebuild b/www-apps/project2/project2-721.ebuild deleted file mode 100644 index 3294a9f..0000000 --- a/www-apps/project2/project2-721.ebuild +++ /dev/null @@ -1,66 +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 odbc postgres +console +web +fastcgi" - -DEPEND=" - dev-util/boost-build - net-libs/libesmtp - www-client/lynx - dev-cpp/libxmlpp - sys-libs/zlib - >=sys-devel/gcc-4.5 - >=dev-cpp/glibmm-2.28 - >=dev-libs/boost-1.45 - odbc? ( dev-db/unixODBC ) - postgres? ( dev-db/postgresql-base ) - web? ( - www-apache/mod_transform - 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 !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 : : : \"${CXXFLAGS}\" \"${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} ${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} ${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-725.ebuild b/www-apps/project2/project2-725.ebuild new file mode 100644 index 0000000..3294a9f --- /dev/null +++ b/www-apps/project2/project2-725.ebuild @@ -0,0 +1,66 @@ +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 odbc postgres +console +web +fastcgi" + +DEPEND=" + dev-util/boost-build + net-libs/libesmtp + www-client/lynx + dev-cpp/libxmlpp + sys-libs/zlib + >=sys-devel/gcc-4.5 + >=dev-cpp/glibmm-2.28 + >=dev-libs/boost-1.45 + odbc? ( dev-db/unixODBC ) + postgres? ( dev-db/postgresql-base ) + web? ( + www-apache/mod_transform + 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 !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 : : : \"${CXXFLAGS}\" \"${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} ${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} ${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