Fix shared-files installation and --as-needed linking (bug #430024).

Package-Manager: portage-2.1.11.58/cvs/Linux x86_64
Manifest-Sign-Key: 0x1E0CA85F!

8 files changed, 131 insertions, 117 deletions

diff --git a/x11-misc/seetxt/ChangeLog b/x11-misc/seetxt/ChangeLog
index 8da42e3fbe21..aadbd7c5d30d 100644
--- a/x11-misc/seetxt/ChangeLog
+++ b/x11-misc/seetxt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/seetxt
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/seetxt/ChangeLog,v 1.1 2012/05/16 06:34:17 dev-zero Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/seetxt/ChangeLog,v 1.2 2013/04/09 05:41:27 dev-zero Exp $
+
+*seetxt-0.72-r1 (09 Apr 2013)
+
+  09 Apr 2013; Tiziano Müller <dev-zero@gentoo.org>
+  +files/0.72-0001-fix-linking.patch,
+  +files/0.72-0002-fix-shared-files-install.patch, +seetxt-0.72-r1.ebuild,
+  -files/0.6-respect_destdir.patch, -seetxt-0.6.ebuild, -seetxt-0.72.ebuild:
+  Fix shared-files installation and --as-needed linking (bug #430024).
 
 *seetxt-0.72 (16 May 2012)
 *seetxt-0.6 (16 May 2012)
@@ -18,4 +26,3 @@
   20 Oct 2010; Tiziano Müller <dev-zero@gentoo.org>
   +files/0.6-respect_destdir.patch, +see-0.6.ebuild, +metadata.xml:
   Initial commit (ebuild written by me).
-
diff --git a/x11-misc/seetxt/Manifest b/x11-misc/seetxt/Manifest
index 4b70d14cb00e..6d3ecd58e521 100644
--- a/x11-misc/seetxt/Manifest
+++ b/x11-misc/seetxt/Manifest
@@ -1,17 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 0.6-respect_destdir.patch 1676 RMD160 99a696de4f93fb82c5852671169b56b96588618e SHA1 c37598dfa56134c08195358c10e6aebc18e8321c SHA256 8a5be0a507d8b9fdcb494996b6bc2502f96b278cccf7199cadec5210643bef5d
-DIST see-0.6.tar.bz2 139769 RMD160 dafa6133324bf5b54374e5730c5f760dd7dd8ace SHA1 bc665fddf0c1cbfd432bf44b3f431f9acd44e65d SHA256 291e8973b3687bc0cf0bedf0a2b88f7301a9bef543f10e1f20260dfee288bdc9
-DIST seetxt-0.72.tar.bz2 141695 RMD160 d6bd6ffc45c7477845efb12bbd524ad3e1ecca1f SHA1 95b1359a54977e19d09ce4449c5bf17db795ee6d SHA256 c38786057e3939f262235c68cf3b8a7d7ab1450ffe4508ec98ec10e16b396159
-EBUILD seetxt-0.6.ebuild 794 RMD160 479637b83633565149e96c84cd45e710ba603d6b SHA1 b9f0344d8e5fa6b938a853abd7a252488bf6af01 SHA256 1f2279330e7fabe5e0b659a914c72865152fe4a4ff73c7bdfcdd44b06d9e022a
-EBUILD seetxt-0.72.ebuild 564 RMD160 399e04d025cc6ce0573dfaab96ffa40aaaa4f94e SHA1 d0ae98faaa8a4ed5d9c4fbcb1653874c92f9fb23 SHA256 94981e0a1d2843f5ce62f76d39f848cd040cbcd55615eeb096265f9a1d33e5e1
-MISC ChangeLog 744 RMD160 06fd3e197a288ac5359ab29aed2927388bed7f12 SHA1 fa80f72d33e4e375ae83be5d471f35009d4cf44d SHA256 e4fd851988557ed298e16a25fa6e7600e3a01659969dda3691780661969b6534
-MISC metadata.xml 312 RMD160 7cb89ec560002b948383a6f470d73acee53e86d0 SHA1 e48e08ade55001fa954e2d43feda03eb0205c65c SHA256 45a60cc85fc306513fcaa46c263b8dcfd3683ce2f5c85e2a418465a32d7e4c13
+AUX 0.72-0001-fix-linking.patch 1182 SHA256 4722b378e5b21db77b20de4db7c8f20f6c4283d641a05317c93cab509c7c2e71 SHA512 c98c0bcd37475b187339a2b161b53005abcbe0aa5cf9533910bddb775e497099b20e95691197f5fcd1d872316b2882981c72a8b39cbbc0a4b3c7aac590781ad5 WHIRLPOOL 86705a6c5a541dfd468f631bb3bbd66213730ed24ffa02854faedc2315e087cb9aad5fae87dac9912be2b4f2409d9e738c134246415563455a46636f5c1b75a4
+AUX 0.72-0002-fix-shared-files-install.patch 1081 SHA256 3f02586712a59a0c31f5cbf2331dea01e8f165bfa905f62eefd67577bacf1cb1 SHA512 9d3fd3ef0e18274fac97408045de72b64a91daa9246e728e74810e70eef33150acc7d62a1e3a2eea5ec21c61866f2e5312bc219b09b7445d852e68516d049620 WHIRLPOOL 049ff7171ff5aa7d61957ddf5802f9c97c70c5503fa30146be7e877a9f29bf072f9d57d58f38aca05ac4564acac5ddb54579cb5f48176ea3827934248464b0a7
+DIST seetxt-0.72.tar.bz2 141695 SHA256 c38786057e3939f262235c68cf3b8a7d7ab1450ffe4508ec98ec10e16b396159 SHA512 3d6e604e3ee8b0d382dcf60a507c54162eb28d5a9d61edc631a40a95f550276bf4e505ea37966a50d7f38ba952408d8d06b91bc71a8eb32322cb047a4ffc27ea WHIRLPOOL 1bd4060d5a2d49e601b868a43aa3e24ea104ed953a96701c50ab7ded234eabf9f31683d14294914e517bd5df641e58f56d50c2b7898338032f3c4561df37d615
+EBUILD seetxt-0.72-r1.ebuild 881 SHA256 f229b3eec408addcb34ddd2ce9e7237a659f99a801f16b0c3cc0ac61dbf7832a SHA512 5857d0111744e6b5e198c91be7e42833484b5c80cbe1cfe006a9ad146ed0c1630f4a2211f895f793403d21480cec9f53102437f9607a188aa2122820284742d7 WHIRLPOOL 16cb1dabc6640b0b2e1c7ee388a8e9406861833674f560a5ae4cde2d76daa6b9f2859145af6c1fb1582f2a8877159b3b74f4ab043b30ee64a6194e6c2285dd59
+MISC ChangeLog 1089 SHA256 2cd924c9138db4dd988a75246f285c05653988940587ee32693e53b29ef2e88e SHA512 157d0c1d9dbfead43d95d0142e5bf5e2f81cfe771f36ae5afee98f37cefcdad06f02c14c6a155f3424b3ba61ee8f820f95f2da59ff40994bb6f94aa49e84e467 WHIRLPOOL 2578550ca35e75db66ed419ee45eaa49b3b6311aac3b3a600b9c09b09a7ea2bd00d2b9a206171f419dc6ddcc90b607e0308d1c28ff209ff0140082ed44405f52
+MISC metadata.xml 312 SHA256 45a60cc85fc306513fcaa46c263b8dcfd3683ce2f5c85e2a418465a32d7e4c13 SHA512 275a948ce6b6f3389f0aa8188665029c670d8faa1b2491c0bb946ae8fcb1d5d2bf91dc58a0f3d7a50d47153c4621234fa8220586b4b5fbecb2a5a318756dc19b WHIRLPOOL 4860aa19361e231b6ce8d6d5f76d1828f7b5f6c9d3899ab638bed92ea812dfa675b379466c2672ce4e816072325a76490017c95bb59431641d2f3462d2143849
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+zSnYACgkQGwVqY66cHjDUawCfYMjld1iP8bbWLT4jPKC+29l7
-afMAniNDD2x4YetwrpxvWxpaGyZybm/M
-=5ehu
+iQF8BAEBCABmBQJRY6oIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RjI0QTQ0MjI1OURBNzI4MEIyREExRkQx
+RTdDRkM3NzFFMENBODVGAAoJEB58/HceDKhffe4H/2st2iyKUE+avtv9dG9eyz+v
+cnEB2cnfb6itBwo11uEYMNPLLdhfe7qajZqltUsWoJQXZq4rR4sqGCHWtt3+jZaS
+IFyV10plZ2N89Pbk+7CypTDm/jzDbYzuovmA7J8YPKOs88FZaEF2mIQElSPcsh5j
+6KYGsSAMS/3GD9qAb+zlzy7ETE1y7ozE1n8Qnp0Cuu2mCt6jdBLL5MhhnDWE1xu2
+p6puuje5xQrlzQvSbbAThWhQ9vNJ13cxDcFoKxKu7B7P6INHnOq1q7akeFhZDnh4
+Rm0TD4czwneCbgE7mZWpQcDYuHKIRgh4K8mPZJ9CpSkRalZkZm9reIlozY/F9kg=
+=OBVd
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/seetxt/files/0.6-respect_destdir.patch b/x11-misc/seetxt/files/0.6-respect_destdir.patch
deleted file mode 100644
index ea4b99888aab..000000000000
--- a/x11-misc/seetxt/files/0.6-respect_destdir.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index d3ce419..9983d6a 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,23 +2,12 @@ SUBDIRS = src
- buildextra = @builddir@/extra
- pkgdatadir = $(datadir)/seetxt-runtime
- 
--install-data-am:
--	-cp -f $(buildextra)/seetxt.1 $(mandir)/man1/
--	-ln -s $(mandir)/man1/seetxt.1 $(mandir)/man1/seeman.1
--	-ln -s $(bindir)/seetxt $(bindir)/seeman
--	@echo "            - enjoy see -"
--	@echo "  Installing some additional files in $(pkgdatadir)..."
--	-mkdir $(pkgdatadir)
--	-cp -f $(buildextra)/seeon.png $(buildextra)/seeoff.png $(buildextra)/.seeconfig $(pkgdatadir)
--	-cp $(buildextra)/filelist $(pkgdatadir)
--	-chmod 666 $(pkgdatadir)/filelist
--	-strip --strip-all $(bindir)/seetxt
-+dist_man_MANS = $(buildextra)/seetxt.1
-+pkgdata_DATA = $(buildextra)/seeon.png $(buildextra)/seeoff.png $(buildextra)/.seeconfig $(buildextra)/filelist
-+
-+install-data-hook:
-+	$(LN_S) seetxt.1 "$(DESTDIR)$(mandir)/man1/seeman.1"
-+
-+uninstall-hook:
-+	$(RM) "$(DESTDIR)$(mandir)/man1/seeman.1"
- 
--uninstall: uninstall-recursive
--	@echo "Thanks for trying SEE!"
--	-rm $(pkgdatadir)/* 
--	-rm $(pkgdatadir)/.seeconfig 
--	-rm $(mandir)/man1/seetxt.1 
--	-rm $(mandir)/man1/seeman.1 
--	-rm $(bindir)/seeman 
--	-rmdir $(pkgdatadir)
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 5181bf2..0d952db 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -3,3 +3,10 @@ seetxt_CFLAGS = -D SDIR=\"$(datadir)/seetxt-runtime\"
- seetxt_LDFLAGS = `pkg-config --libs gtk+-2.0`
- INCLUDES = `pkg-config --cflags gtk+-2.0`
- seetxt_SOURCES = see.c see.h
-+
-+install-exec-hook:
-+	$(LN_S) seetxt "$(DESTDIR)$(bindir)/seeman"
-+
-+uninstall-hook:
-+	$(RM) "$(DESTDIR)$(bindir)/seeman"
-+
diff --git a/x11-misc/seetxt/files/0.72-0001-fix-linking.patch b/x11-misc/seetxt/files/0.72-0001-fix-linking.patch
new file mode 100644
index 000000000000..b21e05592933
--- /dev/null
+++ b/x11-misc/seetxt/files/0.72-0001-fix-linking.patch
@@ -0,0 +1,39 @@
+From 0eb39c4c08e7e3787d411a36e4997ae144e2bed5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch>
+Date: Tue, 9 Apr 2013 07:23:19 +0200
+Subject: [PATCH 1/2] Fix linking.
+
+---
+ configure.ac    | 2 +-
+ src/Makefile.am | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3a1aa30..f1d3f30 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,7 +13,7 @@ AM_PROG_CC_C_O
+ AC_PROG_LN_S  # for ln -s (mandatory)
+ 
+ # Checks for libraries.
+-GTK_REQUIRED_VERSION=2.12.0
++PKG_CHECK_MODULES([DEPS], [gtk+-2.0 >= 2.12.0])
+ 
+ # Checks for header files.
+ AC_CHECK_HEADERS([dirent.h errno.h fcntl.h pthread.h stdlib.h string.h regex.h sys/socket.h sys/time.h time.h unistd.h])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2c8a24d..fca6504 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,5 +1,7 @@
++AM_CPPFLAGS = $(DEPS_CFLAGS)
++
+ bin_PROGRAMS = seetxt
+ seetxt_CFLAGS = -D SDIR=\"$(datadir)/seetxt-runtime\"
+-seetxt_LDFLAGS = `pkg-config --libs gtk+-2.0` -lpthread
++seetxt_LDADD = $(DEPS_LIBS) -lpthread
+ INCLUDES = `pkg-config --cflags gtk+-2.0`
+ seetxt_SOURCES = see.c server.c util.c
+-- 
+1.8.1.5
+
diff --git a/x11-misc/seetxt/files/0.72-0002-fix-shared-files-install.patch b/x11-misc/seetxt/files/0.72-0002-fix-shared-files-install.patch
new file mode 100644
index 000000000000..e4f488a32d48
--- /dev/null
+++ b/x11-misc/seetxt/files/0.72-0002-fix-shared-files-install.patch
@@ -0,0 +1,32 @@
+From a1137a02237df31e063af622be0dc76c2ab3e45a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch>
+Date: Tue, 9 Apr 2013 07:24:45 +0200
+Subject: [PATCH 2/2] Fix shared files install
+
+---
+ Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 691c0f1..404d743 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,13 +1,13 @@
+ SUBDIRS = src
+ buildextra = @builddir@/extra
+-pkgdatadir = $(DESTDIR)$(datadir)/seetxt-runtime
++pkgdatadir = $(datadir)/seetxt-runtime
+ 
+ install-data-am:
+ 	-install --mode=644 $(buildextra)/seetxt.1 $(DESTDIR)$(mandir)/man1/
+ 	@echo " "
+ 	@echo "Installing some additional files in $(DESTDIR)$(pkgdatadir)..."
+ 	@echo " "
+-	-mkdir $(pkgdatadir)
++	-mkdir -p $(DESTDIR)$(pkgdatadir)
+ 	-install --mode=644 $(buildextra)/seeon.png $(buildextra)/seeoff.png $(buildextra)/.seeconfig $(buildextra)/COPYING.images $(DESTDIR)$(pkgdatadir)
+ 	-install --mode=666 $(buildextra)/filelist $(DESTDIR)$(pkgdatadir)
+ 	-cd $(DESTDIR)$(mandir)/man1; ln -s seetxt.1 seeman.1
+-- 
+1.8.1.5
+
diff --git a/x11-misc/seetxt/seetxt-0.6.ebuild b/x11-misc/seetxt/seetxt-0.6.ebuild
deleted file mode 100644
index ced516a316ac..000000000000
--- a/x11-misc/seetxt/seetxt-0.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/seetxt/seetxt-0.6.ebuild,v 1.1 2012/05/16 06:34:17 dev-zero Exp $
-
-EAPI=3
-
-inherit autotools eutils
-
-MY_P="see-${PV}"
-
-DESCRIPTION="Clever, lightweight GUI text file and manual page viewer for X windows."
-HOMEPAGE="http://code.google.com/p/seetxt/"
-SRC_URI="http://seetxt.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-respect_destdir.patch"
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS
-}
diff --git a/x11-misc/seetxt/seetxt-0.72-r1.ebuild b/x11-misc/seetxt/seetxt-0.72-r1.ebuild
new file mode 100644
index 000000000000..3370ea7a62b5
--- /dev/null
+++ b/x11-misc/seetxt/seetxt-0.72-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/seetxt/seetxt-0.72-r1.ebuild,v 1.1 2013/04/09 05:41:27 dev-zero Exp $
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Clever, lightweight GUI text file and manual page viewer for X windows."
+HOMEPAGE="http://code.google.com/p/seetxt/ http://seetxt.sourceforge.net/"
+SRC_URI="http://seetxt.googlecode.com/files/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PV}-0001-fix-linking.patch" \
+		"${FILESDIR}/${PV}-0002-fix-shared-files-install.patch"
+	eautoreconf
+}
+
+src_install() {
+	dodir /usr/share/man/man1
+	default
+	sed -i -e 's|local/||' "${D}/usr/share/seetxt-runtime/filelist" || die "sed failed"
+}
+
diff --git a/x11-misc/seetxt/seetxt-0.72.ebuild b/x11-misc/seetxt/seetxt-0.72.ebuild
deleted file mode 100644
index 45cc43edd442..000000000000
--- a/x11-misc/seetxt/seetxt-0.72.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/seetxt/seetxt-0.72.ebuild,v 1.1 2012/05/16 06:34:17 dev-zero Exp $
-
-EAPI=4
-
-DESCRIPTION="Clever, lightweight GUI text file and manual page viewer for X windows."
-HOMEPAGE="http://code.google.com/p/seetxt/ http://seetxt.sourceforge.net/"
-SRC_URI="http://seetxt.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"