From d9d012a57345b0c7271c93b4ca2cf06fef54bee3 Mon Sep 17 00:00:00 2001
From: geos_one <geos_one@6952d904-891a-0410-993b-d76249ca496b>
Date: Sat, 1 May 2010 12:43:00 +0000
Subject: [PATCH] app-admin/mmc-web-inventory: delete old and depend on new
 mmc-web-core package

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@2131 6952d904-891a-0410-993b-d76249ca496b
---
 app-admin/mmc-web-inventory/ChangeLog         |  9 ++++++
 app-admin/mmc-web-inventory/Manifest          | 13 ++------
 .../mmc-web-inventory-1.2.0-r1.ebuild         | 27 ----------------
 .../mmc-web-inventory-1.2.0.ebuild            | 29 -----------------
 .../mmc-web-inventory-1.2.1_p191.ebuild       | 32 -------------------
 .../mmc-web-inventory-1.2.2_p198.ebuild       | 32 -------------------
 .../mmc-web-inventory-1.2.3_p206.ebuild       | 32 -------------------
 ...=> mmc-web-inventory-1.2.4_p221-r1.ebuild} |  4 +--
 8 files changed, 13 insertions(+), 165 deletions(-)
 delete mode 100644 app-admin/mmc-web-inventory/mmc-web-inventory-1.2.0-r1.ebuild
 delete mode 100644 app-admin/mmc-web-inventory/mmc-web-inventory-1.2.0.ebuild
 delete mode 100644 app-admin/mmc-web-inventory/mmc-web-inventory-1.2.1_p191.ebuild
 delete mode 100644 app-admin/mmc-web-inventory/mmc-web-inventory-1.2.2_p198.ebuild
 delete mode 100644 app-admin/mmc-web-inventory/mmc-web-inventory-1.2.3_p206.ebuild
 rename app-admin/mmc-web-inventory/{mmc-web-inventory-1.2.4_p221.ebuild => mmc-web-inventory-1.2.4_p221-r1.ebuild} (87%)

diff --git a/app-admin/mmc-web-inventory/ChangeLog b/app-admin/mmc-web-inventory/ChangeLog
index 01b67e7..1a0ee35 100644
--- a/app-admin/mmc-web-inventory/ChangeLog
+++ b/app-admin/mmc-web-inventory/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 May 2010; Mario Fetka <mario.fetka@gmail.com>
+  -mmc-web-inventory-1.2.0.ebuild, -mmc-web-inventory-1.2.0-r1.ebuild,
+  -mmc-web-inventory-1.2.1_p191.ebuild,
+  -mmc-web-inventory-1.2.2_p198.ebuild,
+  -mmc-web-inventory-1.2.3_p206.ebuild,
+  -mmc-web-inventory-1.2.4_p221.ebuild,
+  +mmc-web-inventory-1.2.4_p221-r1.ebuild:
+  delete old and depend on new mmc-web-core package
+
   18 Feb 2010; Mario Fetka <mario.fetka@gmail.com>
   mmc-web-inventory-1.2.0.ebuild, mmc-web-inventory-1.2.0-r1.ebuild,
   mmc-web-inventory-1.2.1_p191.ebuild, mmc-web-inventory-1.2.2_p198.ebuild,
diff --git a/app-admin/mmc-web-inventory/Manifest b/app-admin/mmc-web-inventory/Manifest
index caac689..4bd53e4 100644
--- a/app-admin/mmc-web-inventory/Manifest
+++ b/app-admin/mmc-web-inventory/Manifest
@@ -1,13 +1,4 @@
-DIST mmc-web-inventory-1.2.0.tar.gz 112643 RMD160 b4079e12623813e4f6bb395c1d96dc58a2fe4ee3 SHA1 33660b1f2052e4e9736243bb28ecbaa95aed1fe2 SHA256 11b1eeb361e5da85fd94985dc165ae7ce7e5287713eac3b2d108e4815f179210
-DIST mmc-web-inventory-1.2.1-191.tar.gz 114835 RMD160 87e14b526cd58b8bebe66fa9da842bd8439315bf SHA1 c2de2853eaff37746535e0edd3a64a3984497c74 SHA256 9679a3614b5046d5dffd45f3a9b1e9aa49bfb20113d440d4b3a6a257c64b0ec9
-DIST mmc-web-inventory-1.2.2-198.tar.gz 114859 RMD160 f7efef74e6e42be5b2c4801e7439b3fb6b301915 SHA1 8cd2f16089c26d02604c634c30d29598d50d1e7d SHA256 924b15eb74508c1a80d5c0d8f732be8a673a72a25f1b2d3705298076b60bc3de
-DIST mmc-web-inventory-1.2.3-206.tar.gz 115751 RMD160 436dcfd26ff46ca2c60c8b2858a9c0703caeb6db SHA1 2d223db5cb928aa71ec38a1dee70b60b7ed2d19d SHA256 7001b8e6005d0213ce26e60dde22afdda46ab36a991155d94712cbf9f72a35a2
 DIST mmc-web-inventory-1.2.4-221.tar.gz 115802 RMD160 3543ec22168522eeb44bac476736fb5593edb13d SHA1 4d7468948124fe4812cd96c4e6e973526eb14e40 SHA256 85882ed5c0296a4ba31e419e4284b934dd141dd9c1cecb3dfdb886ce93614c49
-EBUILD mmc-web-inventory-1.2.0-r1.ebuild 682 RMD160 e87e407e14802c0781f9c30c556d6dfa49200498 SHA1 396520833f0e864b6414d75720cd1d056d363a46 SHA256 b448328864788f1c4970f725387a5cd4acf2d64f23aefd0147e4eafb4d42f418
-EBUILD mmc-web-inventory-1.2.0.ebuild 676 RMD160 533a6d8b45a0f23102dd788af86445c7267f3fa5 SHA1 54b706045d1d3e2ea0423a92e21137296c590096 SHA256 79b076e9647f0ae1de97f389aa2aa08494de003faec08b2508cc6ec3e9054129
-EBUILD mmc-web-inventory-1.2.1_p191.ebuild 769 RMD160 e80ff68fbcbc0d6cdb63275049d1b11d9198fdde SHA1 8d64afac385adf0da2eb8b647924d4c496c6b293 SHA256 0d30fa47e251aff1324ba963e994dda3ccaf22fc69126595f4ee26d5f36282c2
-EBUILD mmc-web-inventory-1.2.2_p198.ebuild 769 RMD160 e80ff68fbcbc0d6cdb63275049d1b11d9198fdde SHA1 8d64afac385adf0da2eb8b647924d4c496c6b293 SHA256 0d30fa47e251aff1324ba963e994dda3ccaf22fc69126595f4ee26d5f36282c2
-EBUILD mmc-web-inventory-1.2.3_p206.ebuild 769 RMD160 e80ff68fbcbc0d6cdb63275049d1b11d9198fdde SHA1 8d64afac385adf0da2eb8b647924d4c496c6b293 SHA256 0d30fa47e251aff1324ba963e994dda3ccaf22fc69126595f4ee26d5f36282c2
-EBUILD mmc-web-inventory-1.2.4_p221.ebuild 769 RMD160 e80ff68fbcbc0d6cdb63275049d1b11d9198fdde SHA1 8d64afac385adf0da2eb8b647924d4c496c6b293 SHA256 0d30fa47e251aff1324ba963e994dda3ccaf22fc69126595f4ee26d5f36282c2
-MISC ChangeLog 1549 RMD160 e63b62972ccc108d9f2691d601693e5bd1687ce0 SHA1 e197e4c09121d237554f5e3ffc2bb761b2d96402 SHA256 4f63b2c1f221577418942e602bf5d9a5258b58adbb7d39a240116ffc685de1af
+EBUILD mmc-web-inventory-1.2.4_p221-r1.ebuild 780 RMD160 71eef61e35128f178d311517b673587e8b16ffe9 SHA1 aef28ff4473b21b94bfa462a43b4dfeb59797c6e SHA256 bed8a0e32c1d4393a6ffabe2207da1337290a858e10f582d31ca41df8ee1b5f3
+MISC ChangeLog 1927 RMD160 7bbf907309c2396f4ef9e1da5c5351a4d6f2612d SHA1 b9924e7a3c6cd2c0e9dd1b1a60620a2851b5d869 SHA256 4afb3d6d40484d66fcaf405e0d47b59498fabbf7a4a41a4ef4e661a7822dbc45
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/app-admin/mmc-web-inventory/mmc-web-inventory-1.2.0-r1.ebuild b/app-admin/mmc-web-inventory/mmc-web-inventory-1.2.0-r1.ebuild
deleted file mode 100644
index 5c0a2d5..0000000
--- a/app-admin/mmc-web-inventory/mmc-web-inventory-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils depend.apache depend.php
-
-DESCRIPTION="Open Source Computer System Management !"
-HOMEPAGE="http://pulse2.mandriva.org/"
-SRC_URI="http://pulse2.mandriva.org/pub/pulse2/sources/${PV}/${P}.tar.gz
-	http://ftp.mars.arge.at/mds/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-IUSE=""
-DEPEND="sys-apps/lsb-release
-	sys-devel/gettext"
-RDEPEND=">=app-admin/mmc-web-base-2.3.1
-	>=app-admin/pulse2-mmc-plugins-${PV}"
-SLOT="0"
-
-need_php_httpd
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install || die "install failed"
-}
diff --git a/app-admin/mmc-web-inventory/mmc-web-inventory-1.2.0.ebuild b/app-admin/mmc-web-inventory/mmc-web-inventory-1.2.0.ebuild
deleted file mode 100644
index 4c8896d..0000000
--- a/app-admin/mmc-web-inventory/mmc-web-inventory-1.2.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils depend.apache depend.php
-
-DESCRIPTION="Open Source Computer System Management !"
-HOMEPAGE="http://pulse2.mandriva.org/"
-SRC_URI="http://mds.mandriva.org/pub/pulse2/sources/${PV}/${P}.tar.gz
-	http://ftp.mars.arge.at/mds/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-IUSE=""
-DEPEND="sys-apps/lsb-release
-	sys-devel/gettext"
-RDEPEND=">=app-admin/mmc-web-base-2.3.1
-	>=app-admin/pulse2-mmc-plugins-${PV}"
-SLOT="0"
-
-need_php_httpd
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install
-}
diff --git a/app-admin/mmc-web-inventory/mmc-web-inventory-1.2.1_p191.ebuild b/app-admin/mmc-web-inventory/mmc-web-inventory-1.2.1_p191.ebuild
deleted file mode 100644
index 8290d84..0000000
--- a/app-admin/mmc-web-inventory/mmc-web-inventory-1.2.1_p191.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils depend.apache depend.php
-
-MY_P="${P/_p/-}"
-MY_PV="${PV/_p*/}"
-
-DESCRIPTION="Open Source Computer System Management !"
-HOMEPAGE="http://pulse2.mandriva.org/"
-SRC_URI="http://pulse2.mandriva.org/pub/pulse2/server/sources/${MY_PV}/${MY_P}.tar.gz
-	http://ftp.mars.arge.at/mds/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-IUSE=""
-DEPEND="sys-apps/lsb-release
-	sys-devel/gettext"
-RDEPEND=">=app-admin/mmc-web-base-2.3.1
-	>=app-admin/pulse2-mmc-plugins-${MY_PV}"
-SLOT="0"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-need_php_httpd
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install || die "install failed"
-}
diff --git a/app-admin/mmc-web-inventory/mmc-web-inventory-1.2.2_p198.ebuild b/app-admin/mmc-web-inventory/mmc-web-inventory-1.2.2_p198.ebuild
deleted file mode 100644
index 8290d84..0000000
--- a/app-admin/mmc-web-inventory/mmc-web-inventory-1.2.2_p198.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils depend.apache depend.php
-
-MY_P="${P/_p/-}"
-MY_PV="${PV/_p*/}"
-
-DESCRIPTION="Open Source Computer System Management !"
-HOMEPAGE="http://pulse2.mandriva.org/"
-SRC_URI="http://pulse2.mandriva.org/pub/pulse2/server/sources/${MY_PV}/${MY_P}.tar.gz
-	http://ftp.mars.arge.at/mds/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-IUSE=""
-DEPEND="sys-apps/lsb-release
-	sys-devel/gettext"
-RDEPEND=">=app-admin/mmc-web-base-2.3.1
-	>=app-admin/pulse2-mmc-plugins-${MY_PV}"
-SLOT="0"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-need_php_httpd
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install || die "install failed"
-}
diff --git a/app-admin/mmc-web-inventory/mmc-web-inventory-1.2.3_p206.ebuild b/app-admin/mmc-web-inventory/mmc-web-inventory-1.2.3_p206.ebuild
deleted file mode 100644
index 8290d84..0000000
--- a/app-admin/mmc-web-inventory/mmc-web-inventory-1.2.3_p206.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils depend.apache depend.php
-
-MY_P="${P/_p/-}"
-MY_PV="${PV/_p*/}"
-
-DESCRIPTION="Open Source Computer System Management !"
-HOMEPAGE="http://pulse2.mandriva.org/"
-SRC_URI="http://pulse2.mandriva.org/pub/pulse2/server/sources/${MY_PV}/${MY_P}.tar.gz
-	http://ftp.mars.arge.at/mds/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
-IUSE=""
-DEPEND="sys-apps/lsb-release
-	sys-devel/gettext"
-RDEPEND=">=app-admin/mmc-web-base-2.3.1
-	>=app-admin/pulse2-mmc-plugins-${MY_PV}"
-SLOT="0"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-need_php_httpd
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr install || die "install failed"
-}
diff --git a/app-admin/mmc-web-inventory/mmc-web-inventory-1.2.4_p221.ebuild b/app-admin/mmc-web-inventory/mmc-web-inventory-1.2.4_p221-r1.ebuild
similarity index 87%
rename from app-admin/mmc-web-inventory/mmc-web-inventory-1.2.4_p221.ebuild
rename to app-admin/mmc-web-inventory/mmc-web-inventory-1.2.4_p221-r1.ebuild
index 8290d84..d3ca3a5 100644
--- a/app-admin/mmc-web-inventory/mmc-web-inventory-1.2.4_p221.ebuild
+++ b/app-admin/mmc-web-inventory/mmc-web-inventory-1.2.4_p221-r1.ebuild
@@ -12,14 +12,14 @@ MY_PV="${PV/_p*/}"
 DESCRIPTION="Open Source Computer System Management !"
 HOMEPAGE="http://pulse2.mandriva.org/"
 SRC_URI="http://pulse2.mandriva.org/pub/pulse2/server/sources/${MY_PV}/${MY_P}.tar.gz
-	http://ftp.mars.arge.at/mds/${MY_P}.tar.gz"
+	http://ftp.disconnected-by-peer.at/mds/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd"
 IUSE=""
 DEPEND="sys-apps/lsb-release
 	sys-devel/gettext"
-RDEPEND=">=app-admin/mmc-web-base-2.3.1
+RDEPEND=">=app-admin/mmc-web-core-2.3.1
 	>=app-admin/pulse2-mmc-plugins-${MY_PV}"
 SLOT="0"