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

(Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key 0x1E0CA85F!)

7 files changed, 115 insertions, 106 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/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"