clean up

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 9 insertions, 167 deletions

diff --git a/dev-tex/mpm/ChangeLog b/dev-tex/mpm/ChangeLog
index 308945653f33..19bedf2bf498 100644
--- a/dev-tex/mpm/ChangeLog
+++ b/dev-tex/mpm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tex/mpm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/mpm/ChangeLog,v 1.17 2009/07/16 18:46:36 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/mpm/ChangeLog,v 1.18 2009/07/16 18:48:08 fauli Exp $
+
+  16 Jul 2009; Christian Faulhammer <fauli@gentoo.org> -mpm-2.7.3107.ebuild,
+  -files/mpm-2.7.3107-gcc-4.3.patch:
+  clean up
 
 *mpm-2.7.3135 (16 Jul 2009)
 
diff --git a/dev-tex/mpm/Manifest b/dev-tex/mpm/Manifest
index 72deda40fbc0..d1cce880eefe 100644
--- a/dev-tex/mpm/Manifest
+++ b/dev-tex/mpm/Manifest
@@ -2,17 +2,14 @@
 Hash: SHA1
 
 AUX mpm-2.7.2817-multipleroots.patch 639 RMD160 e03309e72e4fa4e5f72a77f1a3aef5a889cf3818 SHA1 1a1b839dcb16f182f63b60294ec8cab3ef0cb33b SHA256 5033e11846e7c4f2678a187f48c50dc4847b919296b47f8b50dc0c2b3fd2305a
-AUX mpm-2.7.3107-gcc-4.3.patch 5051 RMD160 7d0f3491ebc57024e436e6aa14f53938796ff5de SHA1 b13c8742417a49d1b5fecdd9b8fcc98c04862fe1 SHA256 f0680ddbd2ff89ffa41f52b1a0fb3a8bc706b0977e5a6a1379f02afef0297c5d
-DIST miktex-2.7.3107.tar.bz2 14660598 RMD160 44b6581323bc5037b3cbc052c8cd8f2ca3507522 SHA1 c3b51c221f69b197b6ec9721ca06140a8c4f781c SHA256 978a995b9babee488dbf0bd18ca53c1b9d0788ecc25dc3dd6f4f3401825de39f
 DIST miktex-2.7.3135.tar.bz2 14686707 RMD160 5b395abf8e72ec95c18076d34e5314e8cdfc29d3 SHA1 5d8ace60b57efce01f34af11a5b0a9785ce9c0b2 SHA256 a4b36b53201503d84c68dd722121b2763d432fa6e0abd3a9fc9c102ded20a5e5
-EBUILD mpm-2.7.3107.ebuild 889 RMD160 3919b25faf8501a682d6fb490b60baa5d1f48da9 SHA1 4b96bd5a354c7ff9ea8219b2abd96bb3a1dbc446 SHA256 06d522f54f05d0c83932c6c6bde83b2ebd2bfee3e4061f352e79191df49789c7
 EBUILD mpm-2.7.3135.ebuild 888 RMD160 0c8453e6c0a108ac72ea8bda22f63c6c0df5cd86 SHA1 1ef6205ce8b365ded054b4835195fa9f619d4407 SHA256 bf04e80b052149b164a4ee590b011a436025a472ef9f6f9b551a7923030195bd
-MISC ChangeLog 3307 RMD160 423835854c5c280dd3dcc3425844fe914d9d6acf SHA1 853d0379a994450b19bfcfe9aff90f0e721348a7 SHA256 9c7f137c9a0d78894957670c21e3af7b3afd2c035b3404300acb8ec2a97bf2a5
+MISC ChangeLog 3433 RMD160 000dfc133ac34174d4f2aca2c8def37505ac1e06 SHA1 0887f347737d694036bcda710530620c1d0d5e16 SHA256 2c98d433aaeae44cbb8a0068865167c09b64085d7cca9a1c847a98e9e96fe11e
 MISC metadata.xml 250 RMD160 2f7ce1b149af1a91b09329e6a982da55c1289291 SHA1 c2954e799c244f06dd9c3e1f7f5057af777a419b SHA256 e6ce16e4645cc238d4ff7d9c723acfec5ed78671bb929c84fe6c1f3c7fc11b0d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpfdZMACgkQNQqtfCuFnePwxQCfdmg5PFb8m3K8KprxYeKbNrNm
-clUAniPF60WGwQg/JzHEgzEzrIJh+uUu
-=W7O9
+iEYEARECAAYFAkpfde8ACgkQNQqtfCuFneM9DQCcCpPl1Q88+y0wxoDHbJeHdI/x
+BSoAniDsRGN1PxAOPYwnvPaLYCdT5/Fh
+=Y7Hu
 -----END PGP SIGNATURE-----
diff --git a/dev-tex/mpm/files/mpm-2.7.3107-gcc-4.3.patch b/dev-tex/mpm/files/mpm-2.7.3107-gcc-4.3.patch
deleted file mode 100644
index 0b2659fabc57..000000000000
--- a/dev-tex/mpm/files/mpm-2.7.3107-gcc-4.3.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-diff -aur miktex-2.7.3107.old/BuildUtilities/md5walk/md5walk.cpp miktex-2.7.3107/BuildUtilities/md5walk/md5walk.cpp
---- miktex-2.7.3107.old/BuildUtilities/md5walk/md5walk.cpp	2008-07-14 21:04:11.000000000 +0200
-+++ miktex-2.7.3107/BuildUtilities/md5walk/md5walk.cpp	2008-07-14 21:19:05.000000000 +0200
-@@ -21,6 +21,7 @@
- #include <cstdarg>
- #include <cstdio>
- #include <cstdlib>
-+#include <memory>
- 
- #include <miktex/Core/Core>
- #include <popt-miktex.h>
-diff -aur miktex-2.7.3107.old/BuildUtilities/mpc/mpc.cpp miktex-2.7.3107/BuildUtilities/mpc/mpc.cpp
---- miktex-2.7.3107.old/BuildUtilities/mpc/mpc.cpp	2008-07-14 21:04:11.000000000 +0200
-+++ miktex-2.7.3107/BuildUtilities/mpc/mpc.cpp	2008-07-14 21:38:46.000000000 +0200
-@@ -21,6 +21,8 @@
- #include "StdAfx.h"
- #include "internal.h"
- 
-+#include <memory>
-+
- const char * const TheNameOfTheGame = T_("MiKTeX Package Creator");
- 
- #define PROGNAME "mpc"
-diff -aur miktex-2.7.3107.old/Libraries/MiKTeX/Core/include/miktex/Core/Core miktex-2.7.3107/Libraries/MiKTeX/Core/include/miktex/Core/Core
---- miktex-2.7.3107.old/Libraries/MiKTeX/Core/include/miktex/Core/Core	2008-07-14 21:04:10.000000000 +0200
-+++ miktex-2.7.3107/Libraries/MiKTeX/Core/include/miktex/Core/Core	2008-07-14 21:13:57.000000000 +0200
-@@ -58,10 +58,12 @@
- #  include <string>
- #  include <stdexcept>
- #  include <vector>
-+#  include <cstring>
- #else
- #  include <stdio.h>
- #  include <stdlib.h>
- #  include <time.h>
-+#  include <string.h>
- #endif
- 
- #if defined(HAVE_PTHREAD)
-diff -aur miktex-2.7.3107.old/Libraries/MiKTeX/Core/internal.h miktex-2.7.3107/Libraries/MiKTeX/Core/internal.h
---- miktex-2.7.3107.old/Libraries/MiKTeX/Core/internal.h	2008-07-14 21:04:10.000000000 +0200
-+++ miktex-2.7.3107/Libraries/MiKTeX/Core/internal.h	2008-07-14 21:04:49.000000000 +0200
-@@ -40,6 +40,8 @@
- #include "miktex/Core/Trace"
- #include "miktex/Core/Urls"
- 
-+#include <memory>
-+
- using namespace MiKTeX::Core;
- 
- #define BEGIN_INTERNAL_NAMESPACE		\
-diff -aur miktex-2.7.3107.old/Libraries/MiKTeX/Extractor/CabExtractor.h miktex-2.7.3107/Libraries/MiKTeX/Extractor/CabExtractor.h
---- miktex-2.7.3107.old/Libraries/MiKTeX/Extractor/CabExtractor.h	2008-07-14 21:04:10.000000000 +0200
-+++ miktex-2.7.3107/Libraries/MiKTeX/Extractor/CabExtractor.h	2008-07-14 21:23:32.000000000 +0200
-@@ -28,6 +28,8 @@
- 
- #include "miktex/Extractor/Extractor"
- 
-+#include <memory>
-+
- BEGIN_INTERNAL_NAMESPACE;
- 
- class CabExtractor : public MiKTeX::Extractor::Extractor
-diff -aur miktex-2.7.3107.old/Libraries/MiKTeX/Extractor/TarExtractor.h miktex-2.7.3107/Libraries/MiKTeX/Extractor/TarExtractor.h
---- miktex-2.7.3107.old/Libraries/MiKTeX/Extractor/TarExtractor.h	2008-07-14 21:04:10.000000000 +0200
-+++ miktex-2.7.3107/Libraries/MiKTeX/Extractor/TarExtractor.h	2008-07-14 21:23:57.000000000 +0200
-@@ -28,6 +28,8 @@
- 
- #include "miktex/Extractor/Extractor"
- 
-+#include <memory>
-+
- BEGIN_INTERNAL_NAMESPACE;
- 
- class TarExtractor : public MiKTeX::Extractor::Extractor
-diff -aur miktex-2.7.3107.old/Libraries/MiKTeX/PackageManager/CurlWebSession.h miktex-2.7.3107/Libraries/MiKTeX/PackageManager/CurlWebSession.h
---- miktex-2.7.3107.old/Libraries/MiKTeX/PackageManager/CurlWebSession.h	2008-07-14 21:04:10.000000000 +0200
-+++ miktex-2.7.3107/Libraries/MiKTeX/PackageManager/CurlWebSession.h	2008-07-14 21:28:04.000000000 +0200
-@@ -26,6 +26,8 @@
- #if defined(HAVE_LIBCURL) && ! defined(GUARD_8FCCFB2E6A53AC448DF1F0EDABB41EC0_)
- #define GUARD_8FCCFB2E6A53AC448DF1F0EDABB41EC0_
- 
-+#include <memory>
-+
- BEGIN_INTERNAL_NAMESPACE;
- 
- class
-diff -aur miktex-2.7.3107.old/Libraries/MiKTeX/PackageManager/internal.h miktex-2.7.3107/Libraries/MiKTeX/PackageManager/internal.h
---- miktex-2.7.3107.old/Libraries/MiKTeX/PackageManager/internal.h	2008-07-14 21:04:10.000000000 +0200
-+++ miktex-2.7.3107/Libraries/MiKTeX/PackageManager/internal.h	2008-07-14 21:27:26.000000000 +0200
-@@ -28,6 +28,8 @@
- #define F927BA187CB94546AB9CA9099D989E81
- #include "miktex/PackageManager/PackageManager"
- 
-+#include <memory>
-+
- #define BEGIN_INTERNAL_NAMESPACE			\
- namespace MiKTeX {					\
-   namespace Packages {					\
-diff -aur miktex-2.7.3107.old/Programs/MiKTeX/initexmf/initexmf.cpp miktex-2.7.3107/Programs/MiKTeX/initexmf/initexmf.cpp
---- miktex-2.7.3107.old/Programs/MiKTeX/initexmf/initexmf.cpp	2008-07-14 21:04:10.000000000 +0200
-+++ miktex-2.7.3107/Programs/MiKTeX/initexmf/initexmf.cpp	2008-07-14 21:36:35.000000000 +0200
-@@ -33,6 +33,7 @@
- #include <stack>
- #include <string>
- #include <vector>
-+#include <memory>
- 
- #include "initexmf-version.h"
- 
-diff -aur miktex-2.7.3107.old/Programs/MiKTeX/PackageManager/mpm/mpm.cpp miktex-2.7.3107/Programs/MiKTeX/PackageManager/mpm/mpm.cpp
---- miktex-2.7.3107.old/Programs/MiKTeX/PackageManager/mpm/mpm.cpp	2008-07-14 21:04:10.000000000 +0200
-+++ miktex-2.7.3107/Programs/MiKTeX/PackageManager/mpm/mpm.cpp	2008-07-14 21:34:26.000000000 +0200
-@@ -23,6 +23,9 @@
- 
- #include "internal.h"
- 
-+#include <memory>
-+#include <climits>
-+
- #if ! defined(THE_NAME_OF_THE_GAME)
- #  define THE_NAME_OF_THE_GAME T_("MiKTeX Package Manager")
- #endif
diff --git a/dev-tex/mpm/mpm-2.7.3107.ebuild b/dev-tex/mpm/mpm-2.7.3107.ebuild
deleted file mode 100644
index 67c5aa8cd124..000000000000
--- a/dev-tex/mpm/mpm-2.7.3107.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tex/mpm/mpm-2.7.3107.ebuild,v 1.4 2008/07/21 06:24:35 opfer Exp $
-
-inherit eutils cmake-utils
-
-DESCRIPTION="MiKTeX Tools -- package manager for a TeX distribution"
-HOMEPAGE="http://www.miktex.org/unx/"
-SRC_URI="http://ftp.dante.de/tex-archive/systems/win32/miktex/source/miktex-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND="net-misc/curl
-		dev-libs/pth
-		virtual/latex-base
-		www-client/lynx
-		dev-libs/libxslt
-		!media-sound/mpc"
-
-S="${WORKDIR}/miktex-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-2.7.2817-multipleroots.patch"
-	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
-}
-
-pkg_postinst() {
-	elog ""
-	elog "Remember to run \"mpm --update-db\" as root before using mpm."
-	elog ""
-}