unused

Package-Manager: portage-2.1.9.12/cvs/Linux x86_64

6 files changed, 8 insertions, 188 deletions

diff --git a/net-misc/mediatomb/ChangeLog b/net-misc/mediatomb/ChangeLog
index dd7a7da6581a..8a808060c532 100644
--- a/net-misc/mediatomb/ChangeLog
+++ b/net-misc/mediatomb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/mediatomb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.18 2010/08/19 01:59:51 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mediatomb/ChangeLog,v 1.19 2010/10/08 21:25:14 darkside Exp $
+
+  08 Oct 2010; Jeremy Olexa <darkside@gentoo.org>
+  -files/mediatomb-0.11.0+curl-7.18.patch,
+  -files/mediatomb-0.11.0+glibc-2.10.patch,
+  -files/mediatomb-0.11.0-newffmpeg.patch, -files/mediatomb-0.11.0.config:
+  unused
 
   19 Aug 2010; Jeremy Olexa <darkside@gentoo.org> -mediatomb-0.11.0.ebuild,
   -mediatomb-0.12.0-r1.ebuild, files/mediatomb-0.12.0.confd,
diff --git a/net-misc/mediatomb/Manifest b/net-misc/mediatomb/Manifest
index 6e76b32bff0a..9e6865e917bc 100644
--- a/net-misc/mediatomb/Manifest
+++ b/net-misc/mediatomb/Manifest
@@ -1,11 +1,7 @@
-AUX mediatomb-0.11.0+curl-7.18.patch 524 RMD160 beb5dd3f23437af630182ef1b4228622e0d3594c SHA1 c256310f7785b7f26298dba9284a1c72885fc0f5 SHA256 6015e2fac0409322e917a1b5426333581167cc2b30677883c221e4726f0553be
-AUX mediatomb-0.11.0+glibc-2.10.patch 733 RMD160 277863d375f03b5aed4e7479594daf6e221b9f91 SHA1 fa8f13b3cc5181efacac58dfcc6d097e287f6b82 SHA256 be29e7344db08bd07a449c0bb2a30e9aa4c59bc97275e7534aaf7a4a3d218211
-AUX mediatomb-0.11.0-newffmpeg.patch 2410 RMD160 112b1683bc86325e5584b9e7089f46d4a218d8fc SHA1 4af90200a3cf0a07ce47ea42b6b398002f3d99c1 SHA256 7566cd01d9af848bdfd75949bb586b9a83bb6b9501fe9dba921e93960e2f2fdb
-AUX mediatomb-0.11.0.config 2739 RMD160 0f6d8108052d19940e7f5d2288c9027aa2976dc6 SHA1 2c8bfdf7d370ca7782a930d8ef70a242a2942d37 SHA256 0c02298dd2078fed683dad661d933c1f7e43086c77999bf651065ec40ea762c4
 AUX mediatomb-0.12.0.confd 805 RMD160 80b99ac5eb0a3cfdbe658084b6ba8a48c2b97dea SHA1 c3908aa800c4d6f3078760b5c32fbdf745f28239 SHA256 21b1b9d31a6db76c5c1ccfbf00e5cd553eecfeb0e2bb161ccc024eab2243293c
 AUX mediatomb-0.12.0.config 6180 RMD160 ee51ad90cd9c4107376b80af19dfe076f06df8e7 SHA1 41376b8a161d8523846c5adb5375af5bc0c1a0d1 SHA256 cb43e92639e5e53908567c050c9a2fc0e5c349fd11a149414590c2c6a402b4d2
 AUX mediatomb-0.12.0.initd 541 RMD160 cb4ccfebbe98d38a9e4fdedc6f0fa9aa7ab18453 SHA1 e3c8ed51e118cc72a164b908fe4d629a1ebbf14b SHA256 8dfe99d619a3384b2fb9105051daae1fc6c88402364d4203b21344f766a6b696
 DIST mediatomb-0.12.1.tar.gz 1240612 RMD160 ecb61ca2483f76421beef1036ac442b8f805fa96 SHA1 86e880584cc9c8aaf3926d56048510d1d06e76b4 SHA256 31163c34a7b9d1c9735181737cb31306f29f1f2a0335fb4f53ecccf8f62f11cd
 EBUILD mediatomb-0.12.1.ebuild 3540 RMD160 d38b9534f557bf1a10d9cd7f76c52d335be98099 SHA1 c265a06301f63e747c5b0e7c6c18cc8ea18176d0 SHA256 d96bae43c87cedc494d117d313d8ff6bdc3f478029bde9081a3a956793429568
-MISC ChangeLog 3364 RMD160 6aa9b8a816053a106156683d3dfdfb51aefde5f6 SHA1 9d1262f752df681343cf781b02e5cb40b1d8b444 SHA256 fc29f32d1cac808ed21c59b49899fddcc80a7697c2f86f561f6f9cd93863c6e2
+MISC ChangeLog 3586 RMD160 6fb4122fddcdd06839e6e9939e889653359a9b78 SHA1 5c00325d9a4c2fee7a6d9c449ea2535f9a2d15c2 SHA256 e174fa125a489dea81f2021cdeb43e275c4372a1ebcbb4b337fdc37311ff9962
 MISC metadata.xml 917 RMD160 2c817f4ed63ff24ff4262df5897733098ab753f9 SHA1 1eb716452e1ead4a6fb2cf4931f76d2dc9df6cd9 SHA256 a8f81f44d0efc27bd22ebefe96864f84c94c1cadb1908ff1ed52fd3d91b99e23
diff --git a/net-misc/mediatomb/files/mediatomb-0.11.0+curl-7.18.patch b/net-misc/mediatomb/files/mediatomb-0.11.0+curl-7.18.patch
deleted file mode 100644
index 5d0d4b25bdcb..000000000000
--- a/net-misc/mediatomb/files/mediatomb-0.11.0+curl-7.18.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: mediatomb-0.11.0/src/url.cc
-===================================================================
---- mediatomb-0.11.0.orig/src/url.cc
-+++ mediatomb-0.11.0/src/url.cc
-@@ -75,7 +75,7 @@
- 
-     if (only_header)
-     {
--        curl_easy_setopt(curl_handle, CURLOPT_NOBODY);
-+        curl_easy_setopt(curl_handle, CURLOPT_NOBODY, TRUE);
-         curl_easy_setopt(curl_handle, CURLOPT_HEADERFUNCTION, URL::dl);
-         curl_easy_setopt(curl_handle, CURLOPT_HEADERDATA, 
-                          (void *)buffer.getPtr());
diff --git a/net-misc/mediatomb/files/mediatomb-0.11.0+glibc-2.10.patch b/net-misc/mediatomb/files/mediatomb-0.11.0+glibc-2.10.patch
deleted file mode 100644
index ff207b793519..000000000000
--- a/net-misc/mediatomb/files/mediatomb-0.11.0+glibc-2.10.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: src/tools.cc
-===================================================================
---- src/tools.cc	(revisione 2018)
-+++ src/tools.cc	(copia locale)
-@@ -303,8 +303,8 @@
-     Ref<StringBuffer> buf(new StringBuffer(len / 2));
-     for (int i = 0; i < len; i += 2)
-     {
--        char *chi = strchr(HEX_CHARS, ptr[i]);
--        char *clo = strchr(HEX_CHARS, ptr[i + 1]);
-+        const char *chi = strchr(HEX_CHARS, ptr[i]);
-+        const char *clo = strchr(HEX_CHARS, ptr[i + 1]);
-         int hi, lo;
-         
-         if (chi)
-@@ -397,7 +397,7 @@
-             char clo = data[i++];
-             int hi, lo;
- 
--            char *pos;
-+            const char *pos;
- 
-             pos = strchr(hex, chi);
-             if (!pos)
diff --git a/net-misc/mediatomb/files/mediatomb-0.11.0-newffmpeg.patch b/net-misc/mediatomb/files/mediatomb-0.11.0-newffmpeg.patch
deleted file mode 100644
index e18a161cb05b..000000000000
--- a/net-misc/mediatomb/files/mediatomb-0.11.0-newffmpeg.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: mediatomb-0.11.0/configure.ac
-===================================================================
---- mediatomb-0.11.0.orig/configure.ac
-+++ mediatomb-0.11.0/configure.ac
-@@ -2340,9 +2340,14 @@ if test "x$FFMPEG_OK" = xyes; then
-                 ]
-         )
-     else 
--        AC_CHECK_HEADER(ffmpeg/avformat.h,
--            [],
-+        AC_CHECK_HEADERS([ffmpeg/avformat.h libavformat/avformat.h],
-+            [ffmpeg_found=yes; break;], [],
-             [
-+                #define __STDC_CONSTANT_MACROS
-+                #include <stdint.h>
-+            ]
-+        )
-+	if test "x$ffmpeg_found" != "xyes"; then
-                 CPPFLAGS="-I$SEARCH_DIR_HEADERS"
-                 unset ac_cv_header_ffmpeg_avformat_h
-                 AC_CHECK_HEADER($SEARCH_DIR_HEADERS/ffmpeg/avformat.h,
-@@ -2357,12 +2362,7 @@ if test "x$FFMPEG_OK" = xyes; then
-                         #include <stdint.h>
-                     ]
-                 )
--            ],
--            [
--                #define __STDC_CONSTANT_MACROS
--                #include <stdint.h>
--            ]
--        )
-+	fi
-     fi
- fi
-  
-@@ -2447,7 +2447,11 @@ if test "x$FFMPEG_OK" = xyes; then
-             [
-                 #define __STDC_CONSTANT_MACROS
-                 #include <stdint.h>
-+		#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
-+		#include <libavformat/avformat.h>
-+		#else
-                 #include <ffmpeg/avformat.h>
-+		#endif
-             ],
-             [
-                 av_register_all();
-@@ -2462,7 +2466,11 @@ if test "x$FFMPEG_OK" = xyes; then
-                     #define __STDC_CONSTANT_MACROS
-                     #include <stdint.h>
-                     extern "C" {
--                        #include <ffmpeg/avformat.h>
-+                        #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
-+			#include <libavformat/avformat.h>
-+			#else
-+                	#include <ffmpeg/avformat.h>
-+			#endif
-                     }
-                 ],
-                 [
-Index: mediatomb-0.11.0/src/metadata/ffmpeg_handler.cc
-===================================================================
---- mediatomb-0.11.0.orig/src/metadata/ffmpeg_handler.cc
-+++ mediatomb-0.11.0/src/metadata/ffmpeg_handler.cc
-@@ -56,7 +56,11 @@ extern "C" 
- {
- #endif
- 
--#include <ffmpeg/avformat.h>
-+#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
-+# include <libavformat/avformat.h>
-+#else
-+# include <ffmpeg/avformat.h>
-+#endif
- 
- #ifdef FFMPEG_NEEDS_EXTERN_C
- } // extern "C"
diff --git a/net-misc/mediatomb/files/mediatomb-0.11.0.config b/net-misc/mediatomb/files/mediatomb-0.11.0.config
deleted file mode 100644
index 21eb366e4d48..000000000000
--- a/net-misc/mediatomb/files/mediatomb-0.11.0.config
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<config version="1" xmlns="http://mediatomb.cc/config/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://mediatomb.cc/config/1 http://mediatomb.cc/config/1.xsd">
-  <server>
-    <ui enabled="yes">
-      <accounts enabled="no" session-timeout="30">
-        <account user="mediatomb" password="mediatomb"/>
-      </accounts>
-    </ui>
-    <name>MediaTomb</name>
-    <udn></udn>
-    <home>/var/lib/mediatomb</home>
-    <webroot>/usr/share/mediatomb/web</webroot>
-    <storage>
-      <sqlite3 enabled="yes">
-        <database-file>mediatomb.db</database-file>
-      </sqlite3>
-      <mysql enabled="no">
-        <host>localhost</host>
-        <database>mediatomb</database>
-        <username>mediatomb</username>
-        <password>mediatomb</password>
-      </mysql>
-    </storage>
-    <protocolInfo extend="no"/>
-  </server>
-  <import hidden-files="no">
-    <scripting script-charset="UTF-8">
-      <common-script>/usr/share/mediatomb/js/common.js</common-script>
-      <playlist-script>/usr/share/mediatomb/js/playlists.js</playlist-script>
-      <virtual-layout type="builtin">
-        <import-script>/usr/share/mediatomb/js/import.js</import-script>
-      </virtual-layout>
-    </scripting>
-    <mappings>
-      <extension-mimetype ignore-unknown="no">
-        <map from="mp3" to="audio/mpeg"/>
-        <map from="ogg" to="application/ogg"/>
-        <map from="asf" to="video/x-ms-asf"/>
-        <map from="asx" to="video/x-ms-asf"/>
-        <map from="wma" to="audio/x-ms-wma"/>
-        <map from="wax" to="audio/x-ms-wax"/>
-        <map from="wmv" to="video/x-ms-wmv"/>
-        <map from="wvx" to="video/x-ms-wvx"/>
-        <map from="wm" to="video/x-ms-wm"/>
-        <map from="wmx" to="video/x-ms-wmx"/>
-        <map from="m3u" to="audio/x-mpegurl"/>
-        <map from="pls" to="audio/x-scpls"/>
-        <map from="flv" to="video/x-flv"/>
-      </extension-mimetype>
-      <mimetype-upnpclass>
-        <map from="audio/*" to="object.item.audioItem.musicTrack"/>
-        <map from="video/*" to="object.item.videoItem"/>
-        <map from="image/*" to="object.item.imageItem"/>
-      </mimetype-upnpclass>
-      <mimetype-contenttype>
-        <treat mimetype="audio/mpeg" as="mp3"/>
-        <treat mimetype="application/ogg" as="ogg"/>
-        <treat mimetype="audio/x-flac" as="flac"/>
-        <treat mimetype="image/jpeg" as="jpg"/>
-        <treat mimetype="audio/x-mpegurl" as="playlist"/>
-        <treat mimetype="audio/x-scpls" as="playlist"/>
-        <treat mimetype="audio/x-wav" as="pcm"/>
-        <treat mimetype="audio/L16" as="pcm"/>
-        <treat mimetype="video/x-msvideo" as="avi"/>
-      </mimetype-contenttype>
-    </mappings>
-  </import>
-</config>