Fix (twice) the build problems with libtool 2.4 and automake 1.7: don't require libtool at all (since there are no libraries built), but also allow building with automake 1.11; both fixes are actually needed, since disabling libtool causes a couple of side problems.

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

4 files changed, 99 insertions, 8 deletions

diff --git a/media-tv/tvtime/ChangeLog b/media-tv/tvtime/ChangeLog
index 22fd67b9cd5a..885c812a334d 100644
--- a/media-tv/tvtime/ChangeLog
+++ b/media-tv/tvtime/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/tvtime
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.47 2010/05/03 23:26:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/ChangeLog,v 1.48 2010/12/01 05:10:42 flameeyes Exp $
+
+  01 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org> tvtime-1.0.2-r2.ebuild,
+  +files/tvtime-1.0.2-autotools.patch:
+  Fix (twice) the build problems with libtool 2.4 and automake 1.7: don't
+  require libtool at all (since there are no libraries built), but also allow
+  building with automake 1.11; both fixes are actually needed, since disabling
+  libtool causes a couple of side problems.
 
   03 May 2010; Samuli Suominen <ssuominen@gentoo.org>
   tvtime-1.0.2-r2.ebuild:
diff --git a/media-tv/tvtime/Manifest b/media-tv/tvtime/Manifest
index 4298be16adf8..237c79d1a738 100644
--- a/media-tv/tvtime/Manifest
+++ b/media-tv/tvtime/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tvtime-1.0.2+linux-headers-2.6.18.patch 401 RMD160 a299364d7a35d02f67690c1b4df6e41e274ad0f1 SHA1 ca287bed793e153027f071f9153cd9a06c9a7dc6 SHA256 37d61ef2ec6ef32a83221248a1d13090b05e04fb1f47cb204c93d42abbc18e22
+AUX tvtime-1.0.2-autotools.patch 2944 RMD160 ca3d8249d510a6eb6cd76db89434cb283c1a9f12 SHA1 5e9f19996b1d6e7a0bf7333b60de6c9b66a30310 SHA256 e427364797890f9013315ed5b8c19224bdccd5011c6fd3c2aad480ae287dcf67
 AUX tvtime-1.0.2-gcc41.patch 2114 RMD160 9d9068c95fe551cb4d886857b4c24fcebae790a9 SHA1 79d97ba94d2832584f55ccfc7b2e1edf609151eb SHA256 5272246501f80135ba11fdbe15e345e430bade41c552cfdef696d10396a7cdfd
 AUX tvtime-1.0.2-glibc-2.10.patch 963 RMD160 59acc4bb9a3093065f0cc1d203fb10b20bd5346d SHA1 f6ea443a94b60f2d0a69676a8342aa7581b474cc SHA256 1a0f27df35b8dcf86e1f2163b9739d3a195af3cca4c3f312a2ad9f3d25cbf84d
 AUX tvtime-1.0.2-libsupc++.patch 698 RMD160 70d89fe5a6ea9326f452cd2770f5e2523895ab68 SHA1 dec1f5f56b707da74600c8b5bec1c2927d57729d SHA256 4856a3e362f4a111a36532a89faaf47b958e3f68fd46bd6a74db1236cf5abf2f
 AUX tvtime-1.0.2-xinerama.patch 1292 RMD160 1c725852d9c692786614b0e3710a5c38682c1f5e SHA1 39c51a9f264111b6ca400778113d008231613551 SHA256 8177203fe7109782e9d20afa66456e4c21fc973d1fafaa160409b9be29570e5b
 AUX tvtime-pic.patch 254 RMD160 31f3fb8937ae15c28ade1f55a1a6947bf31766cf SHA1 3d90369da57861933b7cb99597d85de60416a358 SHA256 db033fc267bf72034f49705680ced9d086b413efc9f947bd94b4e9117f808d41
 DIST tvtime-1.0.2.tar.gz 1645742 RMD160 e7d9621054edba5833f4ea002be8979983fbf3dc SHA1 ea609876084b2d627a84a1f77bf81cc2175ee58e SHA256 aef2a4bab084df252428d66cabec61b4c63fab32cdfc0cc6599d82efd77f0523
-EBUILD tvtime-1.0.2-r2.ebuild 2041 RMD160 b90782f4ec2a07709bb58f28d96924e12aa08667 SHA1 a9bb090ab678ea2d89d7e28326d7638663afa0ca SHA256 9e99c2d4fd323e7f4f99d66de1253c63aee255b310cc617a32d5a2cf2247717d
-MISC ChangeLog 8218 RMD160 f82da87c72b9097a4478a090952d8304edda1c01 SHA1 154a562a59f9aee54b62a7ba328768a4400a6ca2 SHA256 ac08c09c3504d809f6ded71425708c728a0486b01247ece6e0ca9e0c89332a0c
+EBUILD tvtime-1.0.2-r2.ebuild 2068 RMD160 ea2287e5b9b11e979da220315bb11df4704829a0 SHA1 1fefc924fa1ebb197d44761c7030bba3418024ec SHA256 1235d436840d4c9be8153e39dbacaad664065c3944785be1a52df79322e6fddb
+MISC ChangeLog 8613 RMD160 a869ff3f3e9754ea247e4496c017aaf68f896029 SHA1 2fec38eb8858e2030148d98e01bbc6f8a68869de SHA256 08c74b990b6765e54b01a9478fa7a3dddcf38cbd977c952587ca20367192c52d
 MISC metadata.xml 161 RMD160 fee76f69ba822cd04301c58fa0c26ecaf8cc8fb9 SHA1 0aee2176f15a238a6d8fbbf83e4e0fd58653a3fa SHA256 82d33b3ca60662bc745d30d53bb20d04ea588d5aae556ed16efcacdcc37fd4bd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkz12HYACgkQAiZjviIA2XgaRwCfQrAJxp6Mj7UEqYKJEVqHu740
+cqMAnioiIDj1p9xaSEgzZSd1o53Nun7z
+=gw72
+-----END PGP SIGNATURE-----
diff --git a/media-tv/tvtime/files/tvtime-1.0.2-autotools.patch b/media-tv/tvtime/files/tvtime-1.0.2-autotools.patch
new file mode 100644
index 000000000000..bf02ebefa529
--- /dev/null
+++ b/media-tv/tvtime/files/tvtime-1.0.2-autotools.patch
@@ -0,0 +1,73 @@
+Index: tvtime-1.0.2/src/Makefile.am
+===================================================================
+--- tvtime-1.0.2.orig/src/Makefile.am
++++ tvtime-1.0.2/src/Makefile.am
+@@ -19,9 +19,6 @@ pkgsysconfdir = $(sysconfdir)/@PACKAGE@
+ tmpdir = /tmp
+ localedir = $(datadir)/locale
+ 
+-TTF_CFLAGS = `$(FREETYPE_CONFIG) --cflags`
+-TTF_LIBS = `$(FREETYPE_CONFIG) --libs`
+-
+ # Set the following if you want to specify an additional font directory
+ # FONT_CFLAGS = -DFONTDIR='/usr/share/fonts/truetype/freefont/'
+ 
+@@ -76,20 +73,20 @@ tvtime_SOURCES = $(COMMON_SRCS) $(OUTPUT
+ tvtime_CFLAGS = $(TTF_CFLAGS) $(PNG_CFLAGS) $(OPT_CFLAGS) \
+ 	$(PLUGIN_CFLAGS) $(X11_CFLAGS) $(XML2_FLAG) \
+ 	$(FONT_CFLAGS) $(AM_CFLAGS)
+-tvtime_LDFLAGS  = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \
++tvtime_LDADD  = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \
+ 	$(X11_LIBS) $(XML2_LIBS) -lm -lsupc++
+ 
+ tvtime_command_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
+ 	tvtime-command.c
+ tvtime_command_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
+-tvtime_command_LDFLAGS  = $(ZLIB_LIBS) $(XML2_LIBS)
++tvtime_command_LDADD  = $(ZLIB_LIBS) $(XML2_LIBS)
+ tvtime_configure_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
+ 	tvtime-configure.c
+ tvtime_configure_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
+-tvtime_configure_LDFLAGS  = $(ZLIB_LIBS) $(XML2_LIBS)
++tvtime_configure_LDADD  = $(ZLIB_LIBS) $(XML2_LIBS)
+ tvtime_scanner_SOURCES = utils.h utils.c videoinput.h videoinput.c \
+ 	tvtimeconf.h tvtimeconf.c station.h station.c tvtime-scanner.c \
+ 	mixer.h mixer.c
+ tvtime_scanner_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
+-tvtime_scanner_LDFLAGS  = $(ZLIB_LIBS) $(XML2_LIBS)
++tvtime_scanner_LDADD  = $(ZLIB_LIBS) $(XML2_LIBS)
+ 
+Index: tvtime-1.0.2/configure.ac
+===================================================================
+--- tvtime-1.0.2.orig/configure.ac
++++ tvtime-1.0.2/configure.ac
+@@ -10,6 +10,7 @@ if test x"$host_alias" = x""; then host_
+ 
+ # Check for compilers.
+ AC_PROG_CC
++AM_PROG_CC_C_O
+ AC_CHECK_PROG(found_cc, "$CC", yes, no)
+ test "x$found_cc" = "xyes" || exit 1
+ 
+@@ -17,9 +18,6 @@ AC_PROG_CXX
+ AC_CHECK_PROG(found_cxx, "$CXX", yes, no)
+ test "x$found_cxx" = "xyes" || exit 1
+ 
+-# Check for libtool.
+-AC_PROG_LIBTOOL
+-
+ # Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([ctype.h dirent.h errno.h fcntl.h getopt.h langinfo.h math.h netinet/in.h pwd.h signal.h stdint.h stdio.h stdlib.h string.h sys/ioctl.h sys/mman.h sys/resource.h sys/stat.h sys/time.h sys/wait.h sys/types.h unistd.h wordexp.h locale.h])
+@@ -65,10 +63,7 @@ dnl ------------------------------------
+ dnl freetype
+ dnl ---------------------------------------------
+ dnl Test for freetype
+-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
+-if test "$FREETYPE_CONFIG" = "no" ; then
+-  AC_MSG_ERROR(freetype2 needed and freetype-config not found)
+-fi
++PKG_CHECK_MODULES([TTF], [freetype2])
+ 
+ dnl ---------------------------------------------
+ dnl libxml2
diff --git a/media-tv/tvtime/tvtime-1.0.2-r2.ebuild b/media-tv/tvtime/tvtime-1.0.2-r2.ebuild
index f2bbe1e56070..606d3e903da7 100644
--- a/media-tv/tvtime/tvtime-1.0.2-r2.ebuild
+++ b/media-tv/tvtime/tvtime-1.0.2-r2.ebuild
@@ -1,9 +1,6 @@
 # Copyright 1999-2010 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.6 2010/05/03 23:26:07 ssuominen Exp $
-
-WANT_AUTOMAKE=1.7
-WANT_AUTOCONF=2.5
+# $Header: /var/cvsroot/gentoo-x86/media-tv/tvtime/tvtime-1.0.2-r2.ebuild,v 1.7 2010/12/01 05:10:42 flameeyes Exp $
 
 inherit eutils autotools
 
@@ -33,7 +30,8 @@ RDEPEND="x11-libs/libSM
 	nls? ( virtual/libintl )"
 
 DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	dev-util/pkgconfig"
 
 src_unpack() {
 	unpack ${A}
@@ -56,6 +54,8 @@ src_unpack() {
 
 	epatch "${FILESDIR}/${P}-libsupc++.patch"
 
+	epatch "${FILESDIR}/${P}-autotools.patch"
+
 	AT_M4DIR="m4" eautoreconf
 }