Link to -lsupc++ rather than -lstdc++, this way the dependency over libstdc++.so is dropped.

Package-Manager: portage-2.1.3.19

5 files changed, 135 insertions, 5 deletions

diff --git a/media-tv/tvtime/ChangeLog b/media-tv/tvtime/ChangeLog
index fe60b73d4f66..8129e4d3b610 100644
--- a/media-tv/tvtime/ChangeLog
+++ b/media-tv/tvtime/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/tvtime
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.41 2007/10/06 20:11:09 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.42 2007/11/17 13:35:26 flameeyes Exp $
+
+*tvtime-1.0.2-r2 (17 Nov 2007)
+
+  17 Nov 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +files/tvtime-1.0.2-libsupc++.patch, +tvtime-1.0.2-r2.ebuild:
+  Link to -lsupc++ rather than -lstdc++, this way the dependency over
+  libstdc++.so is dropped.
 
   06 Oct 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   tvtime-1.0.2-r1.ebuild:
diff --git a/media-tv/tvtime/Manifest b/media-tv/tvtime/Manifest
index 5f2f33a85089..80807980cb07 100644
--- a/media-tv/tvtime/Manifest
+++ b/media-tv/tvtime/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tvtime-1.0.2+linux-headers-2.6.18.patch 401 RMD160 a299364d7a35d02f67690c1b4df6e41e274ad0f1 SHA1 ca287bed793e153027f071f9153cd9a06c9a7dc6 SHA256 37d61ef2ec6ef32a83221248a1d13090b05e04fb1f47cb204c93d42abbc18e22
 MD5 29b0aefd80fddae68613854b627e044a files/tvtime-1.0.2+linux-headers-2.6.18.patch 401
 RMD160 a299364d7a35d02f67690c1b4df6e41e274ad0f1 files/tvtime-1.0.2+linux-headers-2.6.18.patch 401
@@ -6,6 +9,10 @@ AUX tvtime-1.0.2-gcc41.patch 2114 RMD160 9d9068c95fe551cb4d886857b4c24fcebae790a
 MD5 c782789825dfa664e1f6fcc96ac7246c files/tvtime-1.0.2-gcc41.patch 2114
 RMD160 9d9068c95fe551cb4d886857b4c24fcebae790a9 files/tvtime-1.0.2-gcc41.patch 2114
 SHA256 5272246501f80135ba11fdbe15e345e430bade41c552cfdef696d10396a7cdfd files/tvtime-1.0.2-gcc41.patch 2114
+AUX tvtime-1.0.2-libsupc++.patch 698 RMD160 70d89fe5a6ea9326f452cd2770f5e2523895ab68 SHA1 dec1f5f56b707da74600c8b5bec1c2927d57729d SHA256 4856a3e362f4a111a36532a89faaf47b958e3f68fd46bd6a74db1236cf5abf2f
+MD5 aa048fd12dfb176e544247148a53bfc7 files/tvtime-1.0.2-libsupc++.patch 698
+RMD160 70d89fe5a6ea9326f452cd2770f5e2523895ab68 files/tvtime-1.0.2-libsupc++.patch 698
+SHA256 4856a3e362f4a111a36532a89faaf47b958e3f68fd46bd6a74db1236cf5abf2f files/tvtime-1.0.2-libsupc++.patch 698
 AUX tvtime-1.0.2-xinerama.patch 1292 RMD160 1c725852d9c692786614b0e3710a5c38682c1f5e SHA1 39c51a9f264111b6ca400778113d008231613551 SHA256 8177203fe7109782e9d20afa66456e4c21fc973d1fafaa160409b9be29570e5b
 MD5 7716009f7064bdae850d1464e33f455d files/tvtime-1.0.2-xinerama.patch 1292
 RMD160 1c725852d9c692786614b0e3710a5c38682c1f5e files/tvtime-1.0.2-xinerama.patch 1292
@@ -19,14 +26,18 @@ EBUILD tvtime-1.0.2-r1.ebuild 1960 RMD160 206c1417aa168b92077d0a4eff7df0c8a1769b
 MD5 c531d4f96add294176966cf76f516a26 tvtime-1.0.2-r1.ebuild 1960
 RMD160 206c1417aa168b92077d0a4eff7df0c8a1769bd6 tvtime-1.0.2-r1.ebuild 1960
 SHA256 fc35e2ce6f237695be0058b398af8443a310f51b5040eddc8c4d4c5dc1131b43 tvtime-1.0.2-r1.ebuild 1960
+EBUILD tvtime-1.0.2-r2.ebuild 2006 RMD160 161916f2139e0f9888d2fc18453f9d53f682c118 SHA1 d36f743326a80f5622091df25c7bcd2cb34491de SHA256 b2c0f1bc40686ce984fad8e1e2415d01869dfd7b2c384ccb7ac26001cfa3be6d
+MD5 8ff2c83f91dc461208d921dbe975c39f tvtime-1.0.2-r2.ebuild 2006
+RMD160 161916f2139e0f9888d2fc18453f9d53f682c118 tvtime-1.0.2-r2.ebuild 2006
+SHA256 b2c0f1bc40686ce984fad8e1e2415d01869dfd7b2c384ccb7ac26001cfa3be6d tvtime-1.0.2-r2.ebuild 2006
 EBUILD tvtime-1.0.2.ebuild 1797 RMD160 e2c6fe5a67236960dafb59288428b1921f750dbf SHA1 57b2974c839db3002369e28212995e9603ca781c SHA256 8fd88c31e8fdbe036f4024787cf91f2b0b3555f39cb63139dc88fb6c4916afcd
 MD5 a22109d8c499bf1c47b37ec63eca66c0 tvtime-1.0.2.ebuild 1797
 RMD160 e2c6fe5a67236960dafb59288428b1921f750dbf tvtime-1.0.2.ebuild 1797
 SHA256 8fd88c31e8fdbe036f4024787cf91f2b0b3555f39cb63139dc88fb6c4916afcd tvtime-1.0.2.ebuild 1797
-MISC ChangeLog 7307 RMD160 281a41b5dd405b16eeb022388d73b1a72cbac65d SHA1 4239b14e6d375d34277f1e0cbd517f524f228d9f SHA256 c28716f6e0ce8affabbaa763552c35a9ccf306418ca5e8aa732d8734100898a4
-MD5 91d0c8fd23d3226c728b12877aa3d448 ChangeLog 7307
-RMD160 281a41b5dd405b16eeb022388d73b1a72cbac65d ChangeLog 7307
-SHA256 c28716f6e0ce8affabbaa763552c35a9ccf306418ca5e8aa732d8734100898a4 ChangeLog 7307
+MISC ChangeLog 7553 RMD160 0e490cc6057073eb9d66f2c2ae3c6d541d5f8490 SHA1 7b68756a361ebe69e69ea193f4446c0957cda590 SHA256 7cf3f453dfec49e162c8ba29a80dba1bcd2964f8d9b2f7ca85a7d1750c59d815
+MD5 20dfc007236546e188ecf0a13c3fe2cd ChangeLog 7553
+RMD160 0e490cc6057073eb9d66f2c2ae3c6d541d5f8490 ChangeLog 7553
+SHA256 7cf3f453dfec49e162c8ba29a80dba1bcd2964f8d9b2f7ca85a7d1750c59d815 ChangeLog 7553
 MISC metadata.xml 161 RMD160 fee76f69ba822cd04301c58fa0c26ecaf8cc8fb9 SHA1 0aee2176f15a238a6d8fbbf83e4e0fd58653a3fa SHA256 82d33b3ca60662bc745d30d53bb20d04ea588d5aae556ed16efcacdcc37fd4bd
 MD5 20e2255501865de5b568424821abf69d metadata.xml 161
 RMD160 fee76f69ba822cd04301c58fa0c26ecaf8cc8fb9 metadata.xml 161
@@ -37,3 +48,13 @@ SHA256 d674bd6b960c3eefd8f5c1369e9c12445258c8bf0c2f4f6136289f12c77b5e0a files/di
 MD5 ec886e8919b8296612e12ac28fef3ce8 files/digest-tvtime-1.0.2-r1 241
 RMD160 d1a3032830a3b13099c692258158d79efa1f304f files/digest-tvtime-1.0.2-r1 241
 SHA256 d674bd6b960c3eefd8f5c1369e9c12445258c8bf0c2f4f6136289f12c77b5e0a files/digest-tvtime-1.0.2-r1 241
+MD5 ec886e8919b8296612e12ac28fef3ce8 files/digest-tvtime-1.0.2-r2 241
+RMD160 d1a3032830a3b13099c692258158d79efa1f304f files/digest-tvtime-1.0.2-r2 241
+SHA256 d674bd6b960c3eefd8f5c1369e9c12445258c8bf0c2f4f6136289f12c77b5e0a files/digest-tvtime-1.0.2-r2 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHPu0GAiZjviIA2XgRAvZ5AJwOHMhXCiQlaznJFwwmKUFR284DhQCcDsI+
+jSaaTka7fpsK5TGKtEkOxiw=
+=XhZl
+-----END PGP SIGNATURE-----
diff --git a/media-tv/tvtime/files/digest-tvtime-1.0.2-r2 b/media-tv/tvtime/files/digest-tvtime-1.0.2-r2
new file mode 100644
index 000000000000..84daa7261293
--- /dev/null
+++ b/media-tv/tvtime/files/digest-tvtime-1.0.2-r2
@@ -0,0 +1,3 @@
+MD5 4b3d03afe61be239b08b5e522cd8afed tvtime-1.0.2.tar.gz 1645742
+RMD160 e7d9621054edba5833f4ea002be8979983fbf3dc tvtime-1.0.2.tar.gz 1645742
+SHA256 aef2a4bab084df252428d66cabec61b4c63fab32cdfc0cc6599d82efd77f0523 tvtime-1.0.2.tar.gz 1645742
diff --git a/media-tv/tvtime/files/tvtime-1.0.2-libsupc++.patch b/media-tv/tvtime/files/tvtime-1.0.2-libsupc++.patch
new file mode 100644
index 000000000000..cc76d2decc62
--- /dev/null
+++ b/media-tv/tvtime/files/tvtime-1.0.2-libsupc++.patch
@@ -0,0 +1,16 @@
+Link to libsupc++ instead of bringing in libstdc++ just because tomsocomp
+is written in C++. It does not use STL so it needs not the whole standard
+library.
+Index: tvtime-1.0.2/src/Makefile.am
+===================================================================
+--- tvtime-1.0.2.orig/src/Makefile.am
++++ tvtime-1.0.2/src/Makefile.am
+@@ -77,7 +77,7 @@ tvtime_CFLAGS = $(TTF_CFLAGS) $(PNG_CFLA
+ 	$(PLUGIN_CFLAGS) $(X11_CFLAGS) $(XML2_FLAG) \
+ 	$(FONT_CFLAGS) $(AM_CFLAGS)
+ tvtime_LDFLAGS  = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \
+-	$(X11_LIBS) $(XML2_LIBS) -lm -lstdc++
++	$(X11_LIBS) $(XML2_LIBS) -lm -lsupc++
+ 
+ tvtime_command_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
+ 	tvtime-command.c
diff --git a/media-tv/tvtime/tvtime-1.0.2-r2.ebuild b/media-tv/tvtime/tvtime-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..2ba708145c55
--- /dev/null
+++ b/media-tv/tvtime/tvtime-1.0.2-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/tvtime-1.0.2-r2.ebuild,v 1.1 2007/11/17 13:35:26 flameeyes Exp $
+
+WANT_AUTOMAKE=1.7
+WANT_AUTOCONF=2.5
+
+inherit eutils autotools
+
+DESCRIPTION="High quality television application for use with video capture cards"
+HOMEPAGE="http://tvtime.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls xinerama"
+
+RDEPEND="x11-libs/libSM
+	x11-libs/libICE
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXv
+	x11-libs/libXxf86vm
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXtst
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	>=media-libs/freetype-2
+	>=sys-libs/zlib-1.1.4
+	>=media-libs/libpng-1.2
+	>=dev-libs/libxml2-2.5.11
+	nls? ( virtual/libintl )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch ${FILESDIR}/tvtime-1.0.2-gcc41.patch
+
+	# use 'tvtime' for the application icon see bug #66293
+	sed -i -e "s/tvtime.png/tvtime/" docs/net-tvtime.desktop
+
+	# patch to adapt to PIC or __PIC__ for pic support
+	epatch "${FILESDIR}"/${PN}-pic.patch #74227
+
+	epatch "${FILESDIR}/${P}-xinerama.patch"
+
+	# Remove linux headers and patch to build with 2.6.18 headers
+	rm -f "${S}"/src/{videodev.h,videodev2.h}
+	epatch "${FILESDIR}/${P}+linux-headers-2.6.18.patch"
+
+	epatch "${FILESDIR}/${P}-libsupc++.patch"
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	econf $(use_enable nls) \
+		$(use_with xinerama) || die "econf failed"
+	emake || die "compile problem"
+
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dohtml docs/html/*
+	dodoc ChangeLog AUTHORS NEWS README
+}
+
+pkg_postinst() {
+	elog "A default setup for ${PN} has been saved as"
+	elog "/etc/tvtime/tvtime.xml. You may need to modify it"
+	elog "for your needs."
+	elog
+	elog "Detailed information on ${PN} setup can be"
+	elog "found at ${HOMEPAGE}help.html"
+	echo
+}