Fix underlinking, missing depencies by Michael Palimaka (kensington) (bug #370011).

Package-Manager: portage-2.2.0_alpha125/cvs/Linux x86_64

4 files changed, 54 insertions, 24 deletions

diff --git a/x11-misc/xstroke/ChangeLog b/x11-misc/xstroke/ChangeLog
index 2a6601537dcc..1d8256e3110d 100644
--- a/x11-misc/xstroke/ChangeLog
+++ b/x11-misc/xstroke/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xstroke
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xstroke/ChangeLog,v 1.29 2012/05/05 04:53:52 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xstroke/ChangeLog,v 1.30 2012/09/12 01:51:34 jer Exp $
+
+  12 Sep 2012; Jeroen Roovers <jer@gentoo.org> xstroke-0.6-r1.ebuild,
+  +files/xstroke-0.6-underlinking.patch:
+  Fix underlinking, missing depencies by Michael Palimaka (kensington) (bug
+  #370011).
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> xstroke-0.6-r1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/x11-misc/xstroke/Manifest b/x11-misc/xstroke/Manifest
index 7121ffe0b5fb..117a96d3a8ae 100644
--- a/x11-misc/xstroke/Manifest
+++ b/x11-misc/xstroke/Manifest
@@ -1,5 +1,16 @@
-AUX xstroke-0.6-sigsegv_sprintf.patch 438 RMD160 d5e4f2d4fb427c0087cf3648d4967998aef170e4 SHA1 5d66d17bc00005ff84157afda687cc0d8d23184c SHA256 d0acd3dac33f2e4bfc03c3b8a73bd04fd5525bdc5a407d04e1ed180284a8c98a
-DIST xstroke-0.6.tar.bz2 140237 RMD160 0872e73b4f28d09943195fce1dc2fd4756a607cf SHA1 d221042a76320c5729d6db180d907e3e86f38383 SHA256 814a38ec6dada26a7bda5439fe34995d5ac812bf2e8c008f8b297ab08b42fb5f
-EBUILD xstroke-0.6-r1.ebuild 997 RMD160 f9bb925cba19380c3a04fbfcea491a19a408228f SHA1 142dd11c923889339b3d1a246acefa6742a9bdf9 SHA256 2737a41103a1358f9960c0023a36959870d5e7dbd92e8818817c564dc7b21ef5
-MISC ChangeLog 3933 RMD160 fa0c027996c755b06009ea11a563424d4371b247 SHA1 d7b038d64cb5dbc550401b14d55ca374cdd147a2 SHA256 abe6012c21eac5daa3ab8bf72cd21a500bb7e4bd4ee216b5d90c82bf8c9feb8e
-MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX xstroke-0.6-sigsegv_sprintf.patch 438 SHA256 d0acd3dac33f2e4bfc03c3b8a73bd04fd5525bdc5a407d04e1ed180284a8c98a SHA512 6ac7fd2b4b64021926c9ec6999df6fd7142b7d42f31012a63ca31ffd6db9848c9687875af508b0f63e7c49dc1cd01057f2073c0bd99409998ec578c44d61f384 WHIRLPOOL 54ab922036df979a325ec3790c44e4255fba448c5c4933ae1dd6f96f9359315764d2c914a490afe104c1da1c7e02aa61f8090e4180a19c8e601e32eae29167f3
+AUX xstroke-0.6-underlinking.patch 443 SHA256 c4d81df637eb8409e3990970ea2bf4ea9c69bb9d7239eada050f4f84df6f2076 SHA512 ef219a2d56bf52df8187cbfee704d1e0dd91f7f742fc2b83c63dd469eb1f6f2297dc8cd09ab2444ad18f94aff5c95bfbff0055084202363426434f3185074c84 WHIRLPOOL 064b3edab9473a301556517dc409d568c4015c3359481af3fdf1e23a5208e949d9936a21b2b8dcb676250c63a3ba92c6c018979736f01e3abb5507241f0a37f7
+DIST xstroke-0.6.tar.bz2 140237 SHA256 814a38ec6dada26a7bda5439fe34995d5ac812bf2e8c008f8b297ab08b42fb5f SHA512 0fb75f20dfcb8db68bb17d50a9dea2906e17ee1d8675bb7b4dea964189aa69c8bfcc101d7e7fac22209da3f83fc0d0afd569d443d3f585bffa2d62ce11ad772a WHIRLPOOL 233caa7771c2dd62e3bebbcfcb54addbcc149d889289142ac024016593618e746f4f80e8173c1605d9142be09a752b0552d92ef829763777111715b62b0c5c61
+EBUILD xstroke-0.6-r1.ebuild 961 SHA256 e751f1b96d7d9d769542b6fc228490318d588b6f5a8e3218c3cc68697094ceca SHA512 75b26a5c058c9afabe7558f62c1c83396bc4816a47a8c6b234b7423b6872846d8cf14f46ec42f35e3cf9e43084ca0d683ace53ee58ab9dd8c29ddcdb5f381d08 WHIRLPOOL 2d7957ce5ab46fe30e88d8d50ddcc55d2193e306fe759dfc4892e662dc0568cc45772b058b7b8da19e7d17e56934cd40a49916c708a84553c5dd5b9fa8800a6b
+MISC ChangeLog 4130 SHA256 211804a20b5aac18ec0bf171376f47f509f71b74c9f486fec10fe405b021f8fd SHA512 fe476531b76e9afbbcfbbed95c15ecc410893ca41b1ceb24f98774087d162c9cfb50da36b3fd061859cbfafe3d125c0051e2e7bd56938e4764e848fdcb0b00c3 WHIRLPOOL 4fbf8c4c597dcf0c0aee187582733532c97140d713977778a7a8f75e0e08c735dde9760eff9a5b29e67e428afcb178c22abd1b90f93b466fc366c5fc4b78cfab
+MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlBP6qwACgkQVWmRsqeSphM46ACfUgX0WjQ0SH3joDaDMafU1Ekk
+430AnRf7ix/igcdKV6WgmAwQrrMuYtW6
+=XpUs
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xstroke/files/xstroke-0.6-underlinking.patch b/x11-misc/xstroke/files/xstroke-0.6-underlinking.patch
new file mode 100644
index 000000000000..52b39ddf4512
--- /dev/null
+++ b/x11-misc/xstroke/files/xstroke-0.6-underlinking.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -40,7 +40,7 @@
+ BUILT_SOURCES = rec_parse.h rec_lex.h rec_lex.c
+ AM_YFLAGS = -d
+ 
+-xstroke_LDADD = @XSTROKE_LIBS@ -lm -lpthread $(X_LIBS) -lXpm -lXtst
++xstroke_LDADD = @XSTROKE_LIBS@ -lm -lpthread $(X_LIBS) -lXpm -lXtst -lX11 -lXrender -lXext -ldl
+ AM_CFLAGS = @XSTROKE_CFLAGS@ -DXSTROKE_CONF_DIR='"$(sysconfdir)/xstroke"' $(X_CFLAGS)
+ 
+ EXTRA_DIST = xstroke_active.xpm xstroke_inactive.xpm etc/alphabet
diff --git a/x11-misc/xstroke/xstroke-0.6-r1.ebuild b/x11-misc/xstroke/xstroke-0.6-r1.ebuild
index f817fba27d23..813bf71f233f 100644
--- a/x11-misc/xstroke/xstroke-0.6-r1.ebuild
+++ b/x11-misc/xstroke/xstroke-0.6-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xstroke/xstroke-0.6-r1.ebuild,v 1.7 2012/05/05 04:53:52 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xstroke/xstroke-0.6-r1.ebuild,v 1.8 2012/09/12 01:51:34 jer Exp $
 
-inherit eutils
+EAPI=4
+inherit autotools eutils
 
 DESCRIPTION="Gesture/Handwriting recognition engine for X"
 # Dead upstream?
@@ -15,27 +16,29 @@ SLOT="0"
 KEYWORDS="alpha ~amd64 hppa ~mips ppc sparc x86"
 IUSE=""
 
-RDEPEND="x11-libs/libXtst
+RDEPEND="
 	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
 	x11-libs/libXpm
 	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXft"
-DEPEND="${RDEPEND}
-	media-libs/freetype
-	media-libs/fontconfig
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
 	virtual/pkgconfig
-	x11-proto/xextproto
+	virtual/yacc
 	x11-proto/inputproto
-	x11-proto/xproto"
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}/${P}-sigsegv_sprintf.patch"
+	x11-proto/xextproto
+	x11-proto/xproto
+"
 
-}
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
-src_install() {
-	make DESTDIR="${D}" BINDIR=/usr/bin install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-sigsegv_sprintf.patch \
+		"${FILESDIR}"/${P}-underlinking.patch
+	eautoreconf
 }