Merge live ebuild patch with upstream changes.

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

3 files changed, 31 insertions, 67 deletions

diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index 1c4514a6c41b..b6bfe7439f36 100644
--- a/media-plugins/vdr-xineliboutput/ChangeLog
+++ b/media-plugins/vdr-xineliboutput/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-xineliboutput
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.57 2010/11/23 17:55:48 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.58 2010/11/26 19:44:44 idl0r Exp $
+
+  26 Nov 2010; Christian Ruppert <idl0r@gentoo.org>
+  files/vdr-xineliboutput-9999-build-system.patch:
+  Merge live ebuild patch with upstream changes.
 
   23 Nov 2010; Christian Ruppert <idl0r@gentoo.org>
   files/vdr-xineliboutput-9999-build-system.patch:
diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index 135c3696f036..4080f4289015 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -4,7 +4,7 @@ Hash: SHA256
 AUX confd-1.0.0_pre6 856 RMD160 0d48271fe6041316f7ad95267f180f896b76c78b SHA1 5d4591f1a2525cdebbda53636c1138cf3563e592 SHA256 fd30a70c06553463414e93771306a59fdabbcf674218dac49d4af46096d6089b
 AUX vdr-xineliboutput-1.0.4_p20090810-compile-fix.diff 3657 RMD160 7f7c9b16b3c00cabe826971cbd3d7a559b1f5577 SHA1 b0cb9b85ee75800045076616da182d5b9eda38a5 SHA256 e4062ec7b43136b2113173641a6b5b7a2d50cd892a0aec8cf778c97874f84743
 AUX vdr-xineliboutput-1.0.5-ldflags.patch 1382 RMD160 92521e35a1e1f30c0f8da49c4e2673cadef03b62 SHA1 0b686aab9344dda5db7e66c77a6acab9437e0020 SHA256 e455aaf86c771e71848f01bd281ac4cbdc4c710a91b1896069bbf41da5c876ad
-AUX vdr-xineliboutput-9999-build-system.patch 6287 RMD160 bd694d40fe4ca269d88e811fd6c03ca2affee15a SHA1 a2e98a95d418ccf9a14683587862db96a88c1ff4 SHA256 bcc3846d7fbddf2b7ce6302d1b96a6f063df0d9ab13676e7ba900c22ca396aeb
+AUX vdr-xineliboutput-9999-build-system.patch 4965 RMD160 6546c9cb2e114b5e397dbfbfaf9796fa9a83ff52 SHA1 77625c146cb4b4987230f517b45685c4e2d5221d SHA256 786bd55172f29be1dadb23320d8c705bce1caffd562d233c4c9cda5d4fa4aada
 DIST vdr-xineliboutput-1.0.2.tgz 325042 RMD160 8564fd1c55c50e665168f4cd46a7bea33419257e SHA1 e7eadd3774429804b168928a840253d827fb5dcf SHA256 de8e4dbb60b73e91f7e13859b3bb246545c201edceb97431ae2bb08933b015b6
 DIST vdr-xineliboutput-1.0.3.tgz 329144 RMD160 b78c8f53d6406c9f499a090d97f082a6d08ec5a1 SHA1 0a97ccb92bbef13421371294dbde8884d7d1d496 SHA256 a194fbdfc79791f0980715dcb98b1f9393562052e125aedb8401f4691be1ae92
 DIST vdr-xineliboutput-1.0.4.tgz 327859 RMD160 2faef32accf4f985bf1a7e748a7d18ccfa519337 SHA1 389d51ea3b56fd312b5273cd3f9ba19fe9e46732 SHA256 c1cb82e02b193356864c0f6e12fb9ef59406fc2ce94244925d7523b3ec58e8ef
@@ -21,16 +21,16 @@ EBUILD vdr-xineliboutput-1.0.4_p20091118.ebuild 3599 RMD160 018f6f522d695eb41e40
 EBUILD vdr-xineliboutput-1.0.5-r1.ebuild 3603 RMD160 b639fe120ee0f4b414c28099801034efbbde34b9 SHA1 474d879901c527dbb640c02be3fbda20d3468a3a SHA256 43acac7740bfca1e0abe75a6608ddbcbccf03f89eb4b90303c089cefbda337eb
 EBUILD vdr-xineliboutput-1.0.5.ebuild 3536 RMD160 4eeb1bdec5e3bb4fd8e200dd9d4441434ba40b10 SHA1 a89f6c96a8080458f8bcb36b1ee936227858d135 SHA256 06a9b61f7e7616ae73a79affe464285173f7465d7f6199fb56c56aaa5aa2a866
 EBUILD vdr-xineliboutput-9999.ebuild 3320 RMD160 82324a56ec80c628acab8dca005a42ce0cc5eb89 SHA1 1f2882e5427ca673335787f7ce99f1e691160c63 SHA256 1c771d18fa352718e2c9c9436e420e857933dcd62f47621195ddd1a6421e80d3
-MISC ChangeLog 11912 RMD160 d795da26fa7221b0885fb2ab193fca5bdcf31623 SHA1 9a17f7dbe546f50ec66d7004c6772b56b2484799 SHA256 85dc727ba866baa24f2080d273f0b50e56f4c180466d1784dc06f8dab0267c02
+MISC ChangeLog 12065 RMD160 1fec6c55b9df2ae97dae70dc816cc1634251dd0b SHA1 6595eff0d3f1d13055a0ccda2f16db8a4f209502 SHA256 fe045cb5ff86ca47e284519d47bc3bb66f97e41a5ecf13f9c1a387b5aa325167
 MISC metadata.xml 901 RMD160 b57c7638aea62eb9259a62287a90e418f1615af5 SHA1 94c1c0c068bf8b4ba19ef876d2f53a16740194fa SHA256 91ce76b6909fe4327c6e68f500764e365bea14af50a6053cdaba6da0fb88e75b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBCAAGBQJM7AAqAAoJEMOx0zmdw4Z1nxkH/3e17YeUliv2KwXUIiVNaJ5f
-u4Mx33FkObgTn2DRSCyTXp7JUbQPFCDl9BiX9kqLr5XE1tdrVsSt0WJTbTGhLMUU
-kmyylQG4pTmaXRulFHtrA9t5VpIBeZCSeynrl7FdnK3leAqDEGfp2cXDH4uvgfgV
-kMbcWpkw4Gml/UtWuTDUtvig9iyd+/BFoF7/D8AEPF4QLdGXTvdtNroGTMEJWCxi
-DUMsCDp+EKQp8V/ICAojK5t8TUybTHMBBAweBC2Pva0F4vdzGA22t4s5xAnVuV9L
-F3bglc932e+prpsxKAS40K8UM9TSI2IDwfckNvHBs3It3q8cFBpFgiNdqb0tMd8=
-=lYhC
+iQEcBAEBCAAGBQJM8A4xAAoJEMOx0zmdw4Z1bQAH/R+po9G+BMqwtXsnqU3xSHJb
+OEiBYKYgQ0fIsrHkBEvaCSWL89GkacepKGP7joNmNeYH04Vdj8r24npSWUPdRyf2
+mSFZJANgbhx1pATsbu9BwEgCOx3WZr4LKJhjLyVOrQzHL5tzbqOWms2gc5osFVUd
+jB3Yn3VYOrVgtXsNLOrOKlgzIFmBwQMg3fNR4bYQtPF/K+uUM8tjBoWGAmgAAk6L
+dqsxkrft8tb5l3DsNhIsljpaILnRF34ScZ5MIcr1fipEa2bfvR4HtRZqFMTluawm
+EJHEyEhxSVD6+0jfLrxaHtlenc7AjG7oCMNZbXz4+vcqbTm5Oc0bIgTpPXLGu9w=
+=BMmj
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch
index 9c44d7ec1689..9caf58043bb0 100644
--- a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch
+++ b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch
@@ -1,41 +1,11 @@
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/Makefile,v
-retrieving revision 1.99
-diff -u -b -B -r1.99 Makefile
---- Makefile	23 Nov 2010 13:46:59 -0000	1.99
-+++ Makefile	23 Nov 2010 17:53:25 -0000
-@@ -127,9 +127,9 @@
- ### The name of executable and libraries
- ###
- 
--VDRPLUGIN            = libvdr-$(PLUGIN).so
--VDRPLUGIN_SXFE       = lib$(PLUGIN)-sxfe.so
--VDRPLUGIN_FBFE       = lib$(PLUGIN)-fbfe.so
-+VDRPLUGIN            = libvdr-$(PLUGIN).so.$(APIVERSION)
-+VDRPLUGIN_SXFE       = lib$(PLUGIN)-sxfe.so.$(VERSION)
-+VDRPLUGIN_FBFE       = lib$(PLUGIN)-fbfe.so.$(VERSION)
- VDRSXFE              = vdr-sxfe
- VDRFBFE              = vdr-fbfe
- XINEINPUTVDR         = xineplug_inp_xvdr.so
-@@ -273,7 +273,7 @@
- 	$(CC) $(CFLAGS) -c $(DEFINES) $(INCLUDES) $(CFLAGS_X11) $(OPTFLAGS) -o $@ $<
- 
- ### Internationalization (I18N):
--
-+ifeq ($(HAVE_I18N), yes)
- PODIR     = po
- LOCALEDIR ?= $(DESTDIR)$(VDRDIR)/locale
- I18Npo    = $(wildcard $(PODIR)/*.po)
-@@ -293,6 +293,7 @@
- $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
- 	@mkdir -p $(dir $@)
- 	cp $< $@
-+endif
- 
- .PHONY: i18n
- i18n: $(I18Nmsgs)
-@@ -311,7 +312,7 @@
+retrieving revision 1.101
+diff -u -b -B -r1.101 Makefile
+--- Makefile	25 Nov 2010 14:28:49 -0000	1.101
++++ Makefile	26 Nov 2010 19:42:55 -0000
+@@ -312,7 +312,7 @@
  install : XINELIBOUTPUT_INSTALL_MSG =
  
  .PHONY: all
@@ -44,34 +14,34 @@ diff -u -b -B -r1.99 Makefile
  
  frontends: config $(TARGETS_FE) $(TARGETS_XINE)
  	$(XINELIBOUTPUT_INSTALL_MSG)
-@@ -328,8 +329,6 @@
+@@ -329,8 +329,6 @@
  
  $(VDRPLUGIN): $(OBJS) $(OBJS_MPG)
  	$(CXX) $(CXXFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $(OBJS) $(OBJS_MPG) $(LIBS) $(LIBS_VDR) -o $@
--	@-rm -rf $(LIBDIR)/$@.$(APIVERSION)
--	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
+-	@-rm -rf $(LIBDIR)/$@
+-	@cp $@ $(LIBDIR)/$@
  
  #
  # vdr-sxfe
-@@ -337,8 +336,6 @@
+@@ -338,8 +336,6 @@
  
  $(VDRPLUGIN_SXFE): $(OBJS_SXFE_SO)
  	$(CC) $(CFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $(OBJS_SXFE_SO) $(LIBS_X11) $(LIBS_XINE) $(LIBS_JPEG) -o $@
--	@-rm -rf $(LIBDIR)/$(VDRPLUGIN_SXFE).$(VERSION)
--	@cp $@ $(LIBDIR)/$(VDRPLUGIN_SXFE).$(VERSION)
+-	@-rm -rf $(LIBDIR)/$(VDRPLUGIN_SXFE)
+-	@cp $@ $(LIBDIR)/$(VDRPLUGIN_SXFE)
  $(VDRSXFE): $(OBJS_SXFE)
  	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_SXFE) $(LIBS_X11) $(LIBS_XINE) $(LIBS_JPEG) $(LIBS_PTHREAD) -o $@
  
-@@ -348,8 +345,6 @@
+@@ -349,8 +345,6 @@
  
  $(VDRPLUGIN_FBFE): $(OBJS_FBFE_SO)
  	$(CC) $(CFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $(OBJS_FBFE_SO) $(LIBS_XINE) $(LIBS_JPEG) -o $@
--	@-rm -rf $(LIBDIR)/$(VDRPLUGIN_FBFE).$(VERSION)
--	@cp $@ $(LIBDIR)/$(VDRPLUGIN_FBFE).$(VERSION)
+-	@-rm -rf $(LIBDIR)/$(VDRPLUGIN_FBFE)
+-	@cp $@ $(LIBDIR)/$(VDRPLUGIN_FBFE)
  $(VDRFBFE): $(OBJS_FBFE)
  	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_FBFE) $(LIBS_XINE) $(LIBS_JPEG) $(LIBS_PTHREAD) -o $@
  
-@@ -370,7 +365,7 @@
+@@ -371,7 +365,7 @@
  # install
  #
  
@@ -80,7 +50,7 @@ diff -u -b -B -r1.99 Makefile
  ifeq ($(XINELIBOUTPUT_XINEPLUGIN), yes)
  	@mkdir -p $(DESTDIR)/$(XINEPLUGINDIR)/post
  	@echo Installing $(DESTDIR)/$(XINEPLUGINDIR)/$(XINEINPUTVDR)
-@@ -391,12 +386,30 @@
+@@ -392,12 +386,30 @@
  	@mkdir -p $(DESTDIR)/$(BINDIR)
  	@-rm -rf $(DESTDIR)/$(BINDIR)/vdr-fbfe
  	@$(INSTALL) -m 0755 vdr-fbfe $(DESTDIR)/$(BINDIR)/vdr-fbfe
@@ -111,23 +81,13 @@ diff -u -b -B -r1.99 Makefile
  endif
  
  dist: clean
-@@ -413,6 +426,7 @@
- 		tools/*.o tools/*~ tools/*.flc xine/*.o xine/*~ \
- 		xine/*.flc $(VDR_FBFE) $(VDR_SXFE) mpg2c black_720x576.c \
- 		nosignal_720x576.c vdrlogo_720x576.c vdr-sxfe vdr-fbfe \
--		$(PODIR)/*.mo $(PODIR)/*.pot \
- 		features.h config.mak configure.log
--
-+ifeq ($(HAVE_I18N), yes)
-+	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
-+endif
 Index: configure
 ===================================================================
 RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/configure,v
 retrieving revision 1.29
 diff -u -b -B -r1.29 configure
 --- configure	23 Nov 2010 13:21:06 -0000	1.29
-+++ configure	23 Nov 2010 17:53:25 -0000
++++ configure	26 Nov 2010 19:42:55 -0000
 @@ -231,7 +231,6 @@
    xshm
    xdpms