Build shared library and install headers.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 108 insertions, 9 deletions

diff --git a/net-libs/libutp/ChangeLog b/net-libs/libutp/ChangeLog
index 917d641f4351..52a06034ee3f 100644
--- a/net-libs/libutp/ChangeLog
+++ b/net-libs/libutp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libutp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libutp/ChangeLog,v 1.1 2013/02/13 20:06:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libutp/ChangeLog,v 1.2 2013/02/27 15:17:27 ssuominen Exp $
+
+*libutp-0_pre20130213-r1 (27 Feb 2013)
+
+  27 Feb 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +libutp-0_pre20130213-r1.ebuild, +files/Makefile:
+  Build shared library and install headers.
 
 *libutp-0_pre20130213 (13 Feb 2013)
 
diff --git a/net-libs/libutp/Manifest b/net-libs/libutp/Manifest
index 24dd2bdd95c1..8eab79afa4fc 100644
--- a/net-libs/libutp/Manifest
+++ b/net-libs/libutp/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX Makefile 1207 SHA256 10b4c280f096ec7e26fdac2106fbc6001aba4ea9e6246b086c2a061fcf0b48c7 SHA512 05cdedf34f64fbc39459fe1be0932daa9247d33c0ac54145c8ba0cb539cb70939706e89186682355c90835efea6ae6fa9603788315dd373df3bb83ff671ab519 WHIRLPOOL bb83634c43c976a2ceaf01b1aac25c33af1890669c844e746dea88bc800637ecc1c24aaa5f17fc85df656d9293a8d3394b33607f6b58238c366edd6c1919da8c
 DIST libutp-0_pre20130213.tar.xz 58812 SHA256 8bc1e74d82cdec6985de860f22efaf0d52d43b94009063d9352b0effae9b3c3b SHA512 bf986db7a691c08a27b830e86c4d1a05b59ead5694a2c8e6ec70e5c745182455f184b7493b12c7ebeac4905e3929c9fddeca2c5890df69839dc2320191054284 WHIRLPOOL 26ef5b0629c9b11aef63da32851f835a9878a01bfbdce2e087e54bbfd8c246288ced78879cb59235133a345839c49c1f1091ef66c0e349c220485b127b705a27
+EBUILD libutp-0_pre20130213-r1.ebuild 899 SHA256 40b635668431ce203f0290d58c7a2a8b444caaed158c4c2ca32962fe2a11253c SHA512 99adf5df99796f53811969710d106e63255db08e20ef3df11291e6d323c6547748b9691df3d9cce97357b0ca7dbba66be7f40b9ff4c20c8121d44282aa23aaa9 WHIRLPOOL ced2405791ff703ed65140557e7b005fff2d9aa87590e18567969e78a8b4666a9f5b8d0260f0bac43cd10bc3bd4c3f601bf2697e4b8ea38c88d96eabe1805240
 EBUILD libutp-0_pre20130213.ebuild 944 SHA256 d55f5d2adac0b536dab0ad13b9f4a5e25264b729673ffac26f86c16afe52260a SHA512 3a46387e2882d93227a5a19632d23ab913571c584f78e7bd9d96bd2e4c2086d23c7dd7d6ef77e3350e375348fa8de422924d8f3962fa6fff59658f89bb2eab3f WHIRLPOOL bce64d23d2a4338d8a753f691b12cfdfb300b1c927fe711a39cf7b1bcf293772424039cb749ad8d2496a6b78ae9ea6fd3eb957dfa5c9f70cbc50894aaf85f9ea
-MISC ChangeLog 404 SHA256 a516e0adb4f4a79a71ab4647cd25e863208571dae5d7640a7272d9bdfd07f932 SHA512 833e3a3664f098b63d60cc0d77768615ebe8f3a63e6800f77a4282dda2f39b27d645fcea53b8c11feb44ae922308c7424576ca9280d50824441c18805554e451 WHIRLPOOL 2d7909ef36ec560de90f8a506fd30ff5a9a42683fe3c5491d15916909f2446778c4f06cc9a93476ca1d45a5453c310c7676d4bd43fa7db33892184fdffa28d23
+MISC ChangeLog 595 SHA256 f19bd9a4134f916eae313640fb7275f5d0143947ad4eb669f82fe3786c775a96 SHA512 eee42ef7ba34f128c56e470b2a9b167b290793159f84c706a006db5d8f45d5bdfb4f5178e034f101674bfb6937c26aab4976fcf905e8e12e55538859c2be1486 WHIRLPOOL b2a3a134bf8287e36ce47177b16f5bc052335ac111bf7301dda66acdccb9b6f8b68a3e11cf7220b5dcc5e7ad0964d4bbb0361f8143edf1149236fa8ddde31dbf
 MISC metadata.xml 237 SHA256 7a2e6c7ce71faf6cb99ccf26a358a88149eb6170ed7f7f89034862873f43b08f SHA512 22ffee20a0ec92bb16a0d1180989753ab208ec3d79717c1c0f6bb5aba3c5b575553a99a3be39078ce0a0dfc7cce706f9e99aecc6b1848e8b693c099580ec0478 WHIRLPOOL 6461aab51b7f01da5d5e6c27d587799936294d901c2bc038d0fcd90477a5bfd173c95e40cdbfc616d7274f9a9aec69d7d0816758ace2c0e8693e3c527ade384a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRG/JZAAoJEEdUh39IaPFNxu0H/1EAhGN+rjHtqXsxt7BaccpC
-lZoZ28Xer3xrC2KGPX0jU0dgiUWRA11B9IVpG/v1fGyc9vGRiJtJhHx03KTHSr/1
-FKFvw23PEaJLhCst8kTesRperyUC4SyR38yg5wA/0HxzEfIvMcmovvVciZOg2JrC
-s5vg43brQXgd9Y3LkFL+6yg0trsN1rJ9/l0M/FAvTnz2Y44Xc5OXqnXOL7ho77MO
-Ap10ARElLG3ZE8UV9gmr9y1Qv9arMKoGMM9+4iULUHD0y0T/3h3hCJ+SYd6Lh5fb
-APDKdwdUQrC9AIGsmswMs2jAlqRdjNeNhwmSt0Sl4vDYRgqtmj0/UHWTnPO+GPA=
-=UQRL
+iQEcBAEBCAAGBQJRLiNCAAoJEEdUh39IaPFNJ74H/0LbkdWDQiUljcpQ+RYaK89F
+HlGAsihYORR1AVumYEv8VcGk0eTLCm2KR+YVrnLFtUHcJuRhLYEn+m2zBz65lLgH
+33wNOReVPb/KU4lmclXpZJsiRwfYowwPfK2z30g3WGUWaJ/QbRmxL9Z6pg+FgYtF
+KWvWiFVAaUvgZrnh3caU/HD6VU5+7fjA2xk7jwQImTTbVXKTqT9V1MRjdXjwyM28
+2t0cLy63JRVmcSTWIQmvn+Q9VwQdXh9AM02vmyR9CLvG0pYWpn/kiZ8mHar1AWGU
+Q0n6T+/xqQ8tiF1AAgOJTW0KmStTZCnwWFwITJrX1PYnxGhaIFVPrSG5cUDokC8=
+=Zr09
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libutp/files/Makefile b/net-libs/libutp/files/Makefile
new file mode 100644
index 000000000000..c11d04facbf2
--- /dev/null
+++ b/net-libs/libutp/files/Makefile
@@ -0,0 +1,48 @@
+AR ?= ar
+CXX ?= g++
+# CPP and CXXFLAGS from original Makefile
+CPPFLAGS += -DPOSIX
+CXXFLAGS += -fno-exceptions -fno-rtti -Wall -I . -I utp_config_lib
+RANLIB ?= ranlib
+LIBDIR ?= /usr/lib
+
+name = libutp
+# No versioning upstream since they only build static archive
+major = 0
+minor = 0.0
+version = $(major).$(minor)
+
+# Copy SRCS= from original Makefile
+src = utp.cpp utp_utils.cpp
+lo = $(addsuffix .lo,$(basename ${src}))
+o = $(addsuffix .o,$(basename ${src}))
+
+lib = so
+ifeq ($(shell uname),Darwin)
+	lib = dylib
+endif
+
+all: $(name).a $(name).$(lib)
+
+%.o: %.cpp
+	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) $< -o $@
+
+$(name).a: $(o)
+	$(AR) q $(name).a $(o)
+	$(RANLIB) $(name).a
+
+%.lo: %.cpp
+	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) -fPIC $< -o $@
+
+$(name).so: $(lo)
+	$(CXX) $(LDFLAGS) -fPIC -shared $(lo) -Wl,-soname,$(name).so.$(major) -o $(name).so.$(version)
+	ln -s $(name).so.$(version) $(name).so.$(major)
+	ln -s $(name).so.$(version) $(name).so
+
+$(name).dylib: $(lo)
+	$(CXX) $(LDFLAGS) -fPIC -dynamiclib $(lo) -install_name $(LIBDIR)/$(name).$(major).dylib -o $(name).$(version).dylib
+	ln -s $(name).$(version).dylib $(name).$(major).dylib
+	ln -s $(name).$(version).dylib $(name).dylib
+
+clean:
+	-rm -f *.o *.lo *.so* *.a
diff --git a/net-libs/libutp/libutp-0_pre20130213-r1.ebuild b/net-libs/libutp/libutp-0_pre20130213-r1.ebuild
new file mode 100644
index 000000000000..fd04183fe305
--- /dev/null
+++ b/net-libs/libutp/libutp-0_pre20130213-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libutp/libutp-0_pre20130213-r1.ebuild,v 1.1 2013/02/27 15:17:27 ssuominen Exp $
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="uTorrent Transport Protocol library"
+HOMEPAGE="http://github.com/bittorrent/libutp"
+SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	sed -i \
+		-e 's:g++:$(CXX):' \
+		-e 's:-Wall:$(LDFLAGS) $(CXXFLAGS) &:' \
+		utp_{file,test}/Makefile || die
+
+	cp -f "${FILESDIR}"/Makefile .
+}
+
+src_compile() {
+	tc-export AR CXX
+	local d
+	for d in . utp_file utp_test; do
+		emake -C ${d}
+	done
+}
+
+src_install() {
+	dolib.a ${PN}.a
+	dolib.so ${PN}.so*
+	insinto /usr/include/${PN}
+	doins *.h
+
+	dobin utp_file/utp_{recv,send} utp_test/utp_test
+
+	dodoc README.md
+}