New package dev-cpp/pficommon. ebuild written by me.

(Portage version: 2.2.0_alpha73/cvs/Linux x86_64)

7 files changed, 346 insertions, 0 deletions

diff --git a/dev-cpp/pficommon/ChangeLog b/dev-cpp/pficommon/ChangeLog
new file mode 100644
index 000000000000..73eac1ddb2c2
--- /dev/null
+++ b/dev-cpp/pficommon/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for dev-cpp/pficommon
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/pficommon/ChangeLog,v 1.1 2011/11/12 23:55:49 naota Exp $
+
+*pficommon-1.3.1.0 (12 Nov 2011)
+
+  12 Nov 2011; Naohiro Aota <naota@gentoo.org> +pficommon-1.3.1.0.ebuild,
+  +files/pficommon-1.3.1.0-libdir.patch,
+  +files/pficommon-1.3.1.0-postgresql.patch,
+  +files/pficommon-1.3.1.0-soname.patch, +metadata.xml:
+  New package dev-cpp/pficommon. ebuild written by me.
+
diff --git a/dev-cpp/pficommon/Manifest b/dev-cpp/pficommon/Manifest
new file mode 100644
index 000000000000..228386a50260
--- /dev/null
+++ b/dev-cpp/pficommon/Manifest
@@ -0,0 +1,7 @@
+AUX pficommon-1.3.1.0-libdir.patch 1171 RMD160 47f6765d48a6f350647144f3fab30193cb255859 SHA1 15f2efbfba65e68255b7804402ad36b0452bb472 SHA256 f087be6c7fed08894d2ceccb6c9058017275c5eea414c87a732337850e79ee10
+AUX pficommon-1.3.1.0-postgresql.patch 613 RMD160 19475d24bd98d428f42840c572cd0cb16eea1531 SHA1 39b24985497ef66ea3f70edfeae6995c0db8a30b SHA256 a5ba8f00172d66fd5a5769af651f4eb1f7ef53276d0cb874bbbb1a5a4ca4d03e
+AUX pficommon-1.3.1.0-soname.patch 6221 RMD160 06e5ff44a49c4d08cf00825642056130cdde1ee2 SHA1 8d6221f49c3c6168fb17e2477765d202cbf14ffa SHA256 f809eb7db7a6ebe18cfe48bfb24945e52aaf07658276227018cdc10e7e537ec2
+DIST pficommon-1.3.1.0.tar.gz 441406 RMD160 372fcb0d9593a8e07f6304d87c9167e05b6d7245 SHA1 14ff3fd29a27f6e4e02a8dd326a444960e2899b9 SHA256 4b644f38825f939e3c9e3649af4a35fee00ea7343dd7711770c6ec713be859c0
+EBUILD pficommon-1.3.1.0.ebuild 1217 RMD160 79ea2357563344ac32dd1759c915da79e7ecfecd SHA1 ca246c8c40f521b385b14ae6524950de7191b8b7 SHA256 0d9bd5f3ecb635bb355603eebf7152d5886f30ea23023def8b340ede9c900640
+MISC ChangeLog 424 RMD160 5bbd8e88dac8a21a32ff4069abbae7c5dc4a087c SHA1 f964b897e8b3bacac10166b022d0b11161c9274a SHA256 d4e7d4d7f2e456b2f28f4e5529678eee12a15f8afe5fb9b142723a7f6fa9606a
+MISC metadata.xml 317 RMD160 41d3cee656063a230e3a94d0e8bc4fb95b6f1ac2 SHA1 757345799a92ca6e052f9ea2d82c4ea495c8cf7b SHA256 9c18e73374552d0083bf90cf4322d16a30b65cdd7bf1c4d516d726c35faf3e32
diff --git a/dev-cpp/pficommon/files/pficommon-1.3.1.0-libdir.patch b/dev-cpp/pficommon/files/pficommon-1.3.1.0-libdir.patch
new file mode 100644
index 000000000000..9bd0e4bf560d
--- /dev/null
+++ b/dev-cpp/pficommon/files/pficommon-1.3.1.0-libdir.patch
@@ -0,0 +1,49 @@
+diff --git a/wscript b/wscript
+index dc1866e..c5b800c 100644
+--- a/wscript
++++ b/wscript
+@@ -6,18 +6,21 @@ out = 'build'
+ 
+ import Options
+ import sys
++import os
+ 
+ subdirs = 'src tools'
+ 
+ def options(opt):
+   opt.load('compiler_cxx')
+   opt.load('unittest_gtest')
++  opt.load('gnu_dirs')
+   
+   opt.recurse(subdirs)
+ 
+ def configure(conf):
+   conf.check_tool('compiler_cxx')
+   conf.check_tool('unittest_gtest')
++  conf.check_tool('gnu_dirs')
+ 
+   conf.env.append_unique(
+     'CXXFLAGS',
+@@ -28,6 +31,8 @@ def configure(conf):
+   conf.recurse(subdirs)
+ 
+   conf.define('PFICOMMON_VERSION', VERSION)
++
++  conf.env['VERSION'] = VERSION
+   
+   conf.write_config_header('src/pfi-config.h')
+   
+@@ -72,11 +77,11 @@ def build(bld):
+   bld(source = 'pficommon.pc.in',
+       prefix = bld.env['PREFIX'],
+       exec_prefix = '${prefix}',
+-      libdir = '${prefix}/lib',
++      libdir = bld.env['LIBDIR'],
+       includedir = '${prefix}/include',
+       PACKAGE = APPNAME,
+       VERSION = VERSION)
+ 
+-  bld.install_files('${PREFIX}/lib/pkgconfig', 'pficommon.pc')
++  bld.install_files(os.path.join(bld.env['LIBDIR'], 'pkgconfig'), 'pficommon.pc')
+   
+   bld.recurse(subdirs)
diff --git a/dev-cpp/pficommon/files/pficommon-1.3.1.0-postgresql.patch b/dev-cpp/pficommon/files/pficommon-1.3.1.0-postgresql.patch
new file mode 100644
index 000000000000..0bf7096ad94f
--- /dev/null
+++ b/dev-cpp/pficommon/files/pficommon-1.3.1.0-postgresql.patch
@@ -0,0 +1,13 @@
+diff --git a/src/database/wscript b/src/database/wscript
+index 8eca1d0..3916a7d 100644
+--- a/src/database/wscript
++++ b/src/database/wscript
+@@ -20,7 +20,7 @@ def configure(conf):
+   conf.env.BUILD_PGSQL = False
+   if not Options.options.disable_database:
+     try:
+-      incdir = subprocess.check_output(['pg_config', '--includedir-server']).decode()
++      incdir = subprocess.check_output(['pg_config', '--includedir-server']).decode('utf-8')
+       libdir = subprocess.check_output(['pg_config', '--libdir']).decode()
+       if conf.check_cxx(lib = 'pq',
+                         header_name = 'postgres.h',
diff --git a/dev-cpp/pficommon/files/pficommon-1.3.1.0-soname.patch b/dev-cpp/pficommon/files/pficommon-1.3.1.0-soname.patch
new file mode 100644
index 000000000000..040fb259bc7d
--- /dev/null
+++ b/dev-cpp/pficommon/files/pficommon-1.3.1.0-soname.patch
@@ -0,0 +1,200 @@
+diff --git a/src/concurrent/wscript b/src/concurrent/wscript
+index 5aeb5ab..8700d68 100644
+--- a/src/concurrent/wscript
++++ b/src/concurrent/wscript
+@@ -19,6 +19,7 @@ def build(bld):
+     source = 'thread.cpp mutex.cpp rwmutex.cpp condition.cpp internal.cpp',
+     target = 'pficommon_concurrent',
+     includes = '.',
++    vnum = bld.env['VERSION'],
+     use = 'pficommon_system PTHREAD')
+ 
+   bld.program(
+diff --git a/src/data/wscript b/src/data/wscript
+index e99c7c3..df47caf 100644
+--- a/src/data/wscript
++++ b/src/data/wscript
+@@ -61,6 +61,7 @@ def build(bld):
+       ],
+     target = 'pficommon_data',
+     includes = incdirs,
++    vnum = bld.env['VERSION'],
+     use = 'pficommon_system')
+ 
+   def t(src):
+diff --git a/src/database/mysql/wscript b/src/database/mysql/wscript
+index 79d5a23..5407091 100644
+--- a/src/database/mysql/wscript
++++ b/src/database/mysql/wscript
+@@ -7,4 +7,5 @@ def build(bld):
+     source = 'connection.cpp statement.cpp value.cpp',
+     target = 'pficommon_database_mysql',
+     includes = '. ..',
++    vnum = bld.env['VERSION'],
+     use = 'pficommon_concurrent MYSQL')
+diff --git a/src/database/postgresql/wscript b/src/database/postgresql/wscript
+index 9b834f8..5040a69 100644
+--- a/src/database/postgresql/wscript
++++ b/src/database/postgresql/wscript
+@@ -7,4 +7,5 @@ def build(bld):
+     source = 'connection.cpp statement.cpp result.cpp value.cpp',
+     target = 'pficommon_database_postgresql',
+     includes = '. ..',
++    vnum = bld.env['VERSION'],
+     use = 'PGSQL')
+diff --git a/src/database/wscript b/src/database/wscript
+index b491d4f..3916a7d 100644
+--- a/src/database/wscript
++++ b/src/database/wscript
+@@ -44,6 +44,7 @@ def build(bld):
+   t = bld.shlib(
+     source = '',
+     target = 'pficommon_database',
++    vnum = bld.env['VERSION'],
+     use = [])
+   
+   if bld.env.BUILD_MYSQL:
+diff --git a/src/lang/wscript b/src/lang/wscript
+index e5538d9..e0ad364 100644
+--- a/src/lang/wscript
++++ b/src/lang/wscript
+@@ -20,6 +20,7 @@ def build(bld):
+ 
+   bld.shlib(
+     source = 'empty.cpp',
++    vnum = bld.env['VERSION'],
+     target = 'pficommon_lang')
+ 
+   bld.program(
+diff --git a/src/math/wscript b/src/math/wscript
+index 8e8e271..f855b3a 100644
+--- a/src/math/wscript
++++ b/src/math/wscript
+@@ -14,6 +14,7 @@ def build(bld):
+   bld.shlib(
+     source = 'random/mersenne_twister.cpp',
+     target = 'pficommon_math',
++    vnum = bld.env['VERSION'],
+     includes = '.')
+   
+   def t(src):
+diff --git a/src/network/wscript b/src/network/wscript
+index 4b0873c..d5a9aee 100644
+--- a/src/network/wscript
++++ b/src/network/wscript
+@@ -56,11 +56,13 @@ def build(bld):
+     source = 'socket.cpp ipv4.cpp dns.cpp uri.cpp',
+     target = 'pficommon_network_base',
+     includes = '.',
++    vnum = bld.env['VERSION'],
+     use = 'pficommon_concurrent')
+   
+   pfin = bld.shlib(
+     source = '',
+     target = 'pficommon_network',
++    vnum = bld.env['VERSION'],
+     use = [
+       'pficommon_network_base',
+       'pficommon_network_http',
+diff --git a/src/system/wscript b/src/system/wscript
+index 4068967..a6fc70c 100644
+--- a/src/system/wscript
++++ b/src/system/wscript
+@@ -21,6 +21,7 @@ def build(bld):
+       'sysstat.cpp',
+       'mmapper.cpp'],
+     target = 'pficommon_system',
++    vnum = bld.env['VERSION'],
+     includes = '.')
+ 
+   bld.program(
+diff --git a/src/text/wscript b/src/text/wscript
+index 2cb54df..e18310c 100644
+--- a/src/text/wscript
++++ b/src/text/wscript
+@@ -16,6 +16,7 @@ def build(bld):
+     source = 'xhtml.cpp csv.cpp json/parser.cpp',
+     target = 'pficommon_text',
+     includes = '. json',
++    vnum = bld.env['VERSION'],
+     use = 'pficommon_data pficommon_system')
+   
+   bld.program(
+diff --git a/src/util/wscript b/src/util/wscript
+index c971da4..7ed427f 100644
+--- a/src/util/wscript
++++ b/src/util/wscript
+@@ -8,6 +8,7 @@ def build(bld):
+   
+   bld.shlib(
+     source = '',
++    vnum = bld.env['VERSION'],
+     target = 'pficommon_util')
+   
+   bld(features = 'cxx cprogram gtest',
+diff --git a/src/visualization/wscript b/src/visualization/wscript
+index bf0500a..04469a1 100644
+--- a/src/visualization/wscript
++++ b/src/visualization/wscript
+@@ -27,6 +27,7 @@ def build(bld):
+   v = bld.shlib(
+     source = ['empty.cpp'],
+     target = 'pficommon_visualization',
++    vnum = bld.env['VERSION'],
+     use =  [])
+   
+   bld.program(
+diff --git a/src/wscript b/src/wscript
+index 8dfd9e8..4af7585 100644
+--- a/src/wscript
++++ b/src/wscript
+@@ -26,6 +26,7 @@ def build(bld):
+   b = bld.shlib(
+     source = 'empty.cpp',
+     target = 'pficommon',
++    vnum = bld.env['VERSION'],
+     use = [
+       'pficommon_concurrent',
+       'pficommon_data',
+diff --git a/src/network/cgi/wscript b/src/network/cgi/wscript
+index 29c44fa..1863394 100644
+--- a/src/network/cgi/wscript
++++ b/src/network/cgi/wscript
+@@ -47,6 +47,7 @@ def build(bld):
+     source = 'base.cpp xhtml_cgi.cpp xhtml_builder.cpp inserter.cpp cgi.cpp server.cpp util.cpp',
+     target = 'pficommon_network_cgi',
+     includes = '. ..',
++    vnum = bld.env['VERSION'],
+     use = 'pficommon_text pficommon_concurrent pficommon_network_http PTHREAD')
+ 
+   if bld.env.BUILD_FCGI:
+diff --git a/src/network/http/wscript b/src/network/http/wscript
+index 7e2bbbe..dbfe480 100644
+--- a/src/network/http/wscript
++++ b/src/network/http/wscript
+@@ -14,4 +14,5 @@ def build(bld):
+     source = 'base.cpp',
+     target = 'pficommon_network_http',
+     includes = '. ..',
++    vnum = bld.env['VERSION'],
+     use = 'pficommon_network_base')
+diff --git a/src/network/mprpc/wscript b/src/network/mprpc/wscript
+index 940bdd4..0e093f6 100644
+--- a/src/network/mprpc/wscript
++++ b/src/network/mprpc/wscript
+@@ -21,4 +21,5 @@ def build(bld):
+       'socket.cpp'
+       ],
+     target = 'pficommon_network_mprpc',
++    vnum = bld.env['VERSION'],
+     use = 'pficommon_concurrent pficommon_network_base MSGPACK')
+diff --git a/src/network/rpc/wscript b/src/network/rpc/wscript
+index 74c006c..46121d6 100644
+--- a/src/network/rpc/wscript
++++ b/src/network/rpc/wscript
+@@ -17,4 +17,5 @@ def build(bld):
+     source = 'base.cpp',
+     target = 'pficommon_network_rpc',
+     includes = '. ..',
++    vnum = bld.env['VERSION'],
+     use = 'pficommon_network_base pficommon_concurrent pficommon_system')
diff --git a/dev-cpp/pficommon/metadata.xml b/dev-cpp/pficommon/metadata.xml
new file mode 100644
index 000000000000..02831a897790
--- /dev/null
+++ b/dev-cpp/pficommon/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>naota@gentoo.org</email>
+</maintainer>
+<use>
+  <flag name='fcgi'>Build FCGI feature</flag>
+  <flag name='mprpc'>Build MessagePack RPC feature</flag>
+</use>
+</pkgmetadata>
diff --git a/dev-cpp/pficommon/pficommon-1.3.1.0.ebuild b/dev-cpp/pficommon/pficommon-1.3.1.0.ebuild
new file mode 100644
index 000000000000..d7f74377b5db
--- /dev/null
+++ b/dev-cpp/pficommon/pficommon-1.3.1.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/pficommon/pficommon-1.3.1.0.ebuild,v 1.1 2011/11/12 23:55:49 naota Exp $
+
+EAPI=4
+
+inherit waf-utils eutils
+
+DESCRIPTION="General purpose C++ library for PFI"
+HOMEPAGE="https://github.com/pfi/pficommon"
+SRC_URI="https://github.com/pfi/pficommon/tarball/${PV} -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="fcgi imagemagick mprpc mysql postgres test"
+
+RDEPEND="fcgi? ( dev-libs/fcgi )
+	imagemagick? (
+		media-libs/lcms
+		media-gfx/imagemagick[cxx]
+		sys-devel/libtool
+	)
+	mprpc? ( dev-libs/msgpack )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
+
+src_unpack() {
+	unpack ${A}
+	mv pfi-pficommon-* "${S}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libdir.patch \
+		"${FILESDIR}"/${P}-soname.patch \
+		"${FILESDIR}"/${P}-postgresql.patch
+}
+
+src_configure() {
+	if use fcgi; then
+		myconf="${myconf} --with-fcgi=/usr"
+	else
+		myconf="${myconf} --disable-fcgi"
+	fi
+	use imagemagick || myconf="${myconf} --disable-magickpp"
+	use mprpc || myconf="${myconf} --disable-mprpc"
+	if ! use mysql && ! use postgres; then
+		myconf="${myconf} --disable-database"
+	fi
+	waf-utils_src_configure ${myconf}
+}