Fix rpath issues, #288524. Thanks to jbergstroem for the shiny patch.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 114 insertions, 2 deletions

diff --git a/app-text/tokyodystopia/ChangeLog b/app-text/tokyodystopia/ChangeLog
index f9120699b144..1a2ba98a4d22 100644
--- a/app-text/tokyodystopia/ChangeLog
+++ b/app-text/tokyodystopia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/tokyodystopia
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tokyodystopia/ChangeLog,v 1.1 2009/10/10 00:00:15 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tokyodystopia/ChangeLog,v 1.2 2009/10/20 20:56:44 patrick Exp $
+
+*tokyodystopia-0.9.13-r1 (20 Oct 2009)
+
+  20 Oct 2009; Patrick Lauer <patrick@gentoo.org>
+  +tokyodystopia-0.9.13-r1.ebuild, +files/fix_rpath.patch:
+  Fix rpath issues, #288524. Thanks to jbergstroem for the shiny patch.
 
 *tokyodystopia-0.9.13 (09 Oct 2009)
 
diff --git a/app-text/tokyodystopia/Manifest b/app-text/tokyodystopia/Manifest
index 34418b6f5465..d7b52c7c9ed4 100644
--- a/app-text/tokyodystopia/Manifest
+++ b/app-text/tokyodystopia/Manifest
@@ -1,4 +1,6 @@
+AUX fix_rpath.patch 2631 RMD160 bf21e4aaacd49d7a2fbefbe6745e05652efdfa3a SHA1 6c107b570a899c94b0d27728af02393a911e8f90 SHA256 6707cfb79b5982e1e474a0feedf23c036d524439a9aeaf900469b468b904f690
 DIST tokyodystopia-0.9.13.tar.gz 150182 RMD160 d45728a60653b9fc183a5a5e13507875c3440afb SHA1 073b2edd6a74e2ae1bbdc7faea42a8a219bdf169 SHA256 19418c3213a0b3065fe59e6c67f3815744c49c3d7816dc944b79cc3a3155bca6
+EBUILD tokyodystopia-0.9.13-r1.ebuild 920 RMD160 af2b592c2fb5c5714005c8e834736e5ff1dbf546 SHA1 dccb474285a8d146a4d1b8b6b3469aaa51719607 SHA256 da92fd7cb072a4b0b942bd2cde7f451f64d69d659f48b62f6796fb7e8e838c64
 EBUILD tokyodystopia-0.9.13.ebuild 860 RMD160 97698990aa2235992c9ff10276554f538534d143 SHA1 47ac43fc00eba6c74e74a6e91618ff1a56f3c404 SHA256 de98e86a11353dfd7247ea994e88aab4decfdce3d6a3e7ef5430150d335fad12
-MISC ChangeLog 460 RMD160 dc33ca1e2960bef14e6271e0cdd21194626abc14 SHA1 d0c5d12f8abc66a246e8c8a1ac1735345e8c47cd SHA256 346d0a7f74299be6a34891fda4ba34877059d4bcc4c9e4e220921aede57286c3
+MISC ChangeLog 682 RMD160 370aa5d93c1219b5025089d4865bf01d5dd076c9 SHA1 d363d69fbae4497075bdbdd8a5c9bfeb93692162 SHA256 2af1fa1a3c110ea8fb0489dc7cd263ef8e5ca24afb3e6d50f8a745458ba8582c
 MISC metadata.xml 255 RMD160 dbe77cd804a4411e8445c05f6e632fdc2f72d082 SHA1 94e7a8d2d43907279488b984c3dcd9fd1888ce25 SHA256 28c7b0445a5f2eb0d524ff3afcef712ecbf345592d26142f71a3ef9bca653d4b
diff --git a/app-text/tokyodystopia/files/fix_rpath.patch b/app-text/tokyodystopia/files/fix_rpath.patch
new file mode 100644
index 000000000000..68c0b6e03510
--- /dev/null
+++ b/app-text/tokyodystopia/files/fix_rpath.patch
@@ -0,0 +1,61 @@
+diff -ur tokyodystopia-0.9.13/Makefile.in tokyodystopia-0.9.13-new/Makefile.in
+--- tokyodystopia-0.9.13/Makefile.in	2009-07-05 04:06:06.000000000 +0200
++++ tokyodystopia-0.9.13-new/Makefile.in	2009-10-20 22:39:18.000000000 +0200
+@@ -55,8 +55,8 @@
+ LDFLAGS = @MYLDFLAGS@
+ CMDLDFLAGS = @MYCMDLDFLAGS@
+ LIBS = @LIBS@
+-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
+-RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
++LDENV = 
++RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR)
+ POSTCMD = @MYPOSTCMD@
+ 
+ 
+diff -ur tokyodystopia-0.9.13/configure.in tokyodystopia-0.9.13-new/configure.in
+--- tokyodystopia-0.9.13/configure.in	2009-06-14 05:44:54.000000000 +0200
++++ tokyodystopia-0.9.13-new/configure.in	2009-10-20 22:40:00.000000000 +0200
+@@ -26,31 +26,14 @@
+ MYPCFILES="tokyodystopia.pc"
+ 
+ # Building flags
+-MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
++MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char"
+ MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include -DNDEBUG -D_GNU_SOURCE=1"
+-MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
++MYLDFLAGS="-L. -L\$(LIBDIR)"
+ MYCMDLDFLAGS=""
+ MYRUNPATH="\$(LIBDIR)"
+ MYLDLIBPATHENV="LD_LIBRARY_PATH"
+ MYPOSTCMD="true"
+ 
+-# Building paths
+-PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+-PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
+-if type pkg-config > /dev/null 2>&1
+-then
+-  PATH="$PATH:`pkg-config --variable=bindir tokyocabinet`"
+-  CPATH="$CPATH:`pkg-config --variable=includedir tokyocabinet`"
+-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`"
+-fi
+-
+-
+ 
+ #================================================================
+ # Options
+diff -ur tokyodystopia-0.9.13/tokyodystopia.pc.in tokyodystopia-0.9.13-new/tokyodystopia.pc.in
+--- tokyodystopia-0.9.13/tokyodystopia.pc.in	2008-02-21 10:45:01.000000000 +0100
++++ tokyodystopia-0.9.13-new/tokyodystopia.pc.in	2009-10-20 22:40:17.000000000 +0200
+@@ -10,5 +10,5 @@
+ Name: Tokyo Dystopia
+ Description: a full-text search system
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -ltokyodystopia @LIBS@
++Libs: -L${libdir} -ltokyodystopia
+ Cflags: -I${includedir}
diff --git a/app-text/tokyodystopia/tokyodystopia-0.9.13-r1.ebuild b/app-text/tokyodystopia/tokyodystopia-0.9.13-r1.ebuild
new file mode 100644
index 000000000000..c7513f6d15fe
--- /dev/null
+++ b/app-text/tokyodystopia/tokyodystopia-0.9.13-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/tokyodystopia/tokyodystopia-0.9.13-r1.ebuild,v 1.1 2009/10/20 20:56:44 patrick Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="A fulltext search engine for Tokyo Cabinet"
+HOMEPAGE="http://1978th.net/tokyodystopia/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+#dev-db/tokyocabinet for depend?
+DEPEND="dev-db/tokyocabinet"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup tyrant
+	enewuser tyrant -1 -1 /var/lib/${PN} tyrant
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/fix_rpath.patch"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+
+	for x in /var/{lib,run,log}/${PN}; do
+		dodir "${x}" || die "Install failed"
+		fowners tyrant:tyrant "${x}"
+	done
+
+}
+
+src_test() {
+	emake -j1 check || die "Tests failed"
+}