From d419f66421fdfd352f9b09772e44694eac97d8fe Mon Sep 17 00:00:00 2001 From: geos_one Date: Sat, 1 May 2010 13:22:42 +0000 Subject: [PATCH] app-admin/pulse2-mmc-plugins: delete old and make it python abi compatible git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@2139 6952d904-891a-0410-993b-d76249ca496b --- app-admin/pulse2-mmc-plugins/ChangeLog | 11 +++++ app-admin/pulse2-mmc-plugins/Manifest | 15 ++---- ...2-mmc-plugins-1.2.4-install-target-1.patch | 47 +++++++++++++++++++ ...ulse2-mmc-plugins-1.2.4-python-fix-1.patch | 25 ++++++++++ .../pulse2-mmc-plugins-1.2.0-r1.ebuild | 39 --------------- .../pulse2-mmc-plugins-1.2.0.ebuild | 41 ---------------- .../pulse2-mmc-plugins-1.2.1_p761.ebuild | 44 ----------------- .../pulse2-mmc-plugins-1.2.2_p776.ebuild | 44 ----------------- .../pulse2-mmc-plugins-1.2.3_p790.ebuild | 44 ----------------- .../pulse2-mmc-plugins-1.2.4_p819-r1.ebuild | 39 +++++++++++++++ .../pulse2-mmc-plugins-1.2.4_p819.ebuild | 44 ----------------- 11 files changed, 126 insertions(+), 267 deletions(-) create mode 100644 app-admin/pulse2-mmc-plugins/files/pulse2-mmc-plugins-1.2.4-install-target-1.patch create mode 100644 app-admin/pulse2-mmc-plugins/files/pulse2-mmc-plugins-1.2.4-python-fix-1.patch delete mode 100644 app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.0-r1.ebuild delete mode 100644 app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.0.ebuild delete mode 100644 app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.1_p761.ebuild delete mode 100644 app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.2_p776.ebuild delete mode 100644 app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.3_p790.ebuild create mode 100644 app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.4_p819-r1.ebuild delete mode 100644 app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.4_p819.ebuild diff --git a/app-admin/pulse2-mmc-plugins/ChangeLog b/app-admin/pulse2-mmc-plugins/ChangeLog index 50f88d4..997382b 100644 --- a/app-admin/pulse2-mmc-plugins/ChangeLog +++ b/app-admin/pulse2-mmc-plugins/ChangeLog @@ -2,6 +2,17 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 01 May 2010; Mario Fetka + -pulse2-mmc-plugins-1.2.0.ebuild, -pulse2-mmc-plugins-1.2.0-r1.ebuild, + -pulse2-mmc-plugins-1.2.1_p761.ebuild, + -pulse2-mmc-plugins-1.2.2_p776.ebuild, + -pulse2-mmc-plugins-1.2.3_p790.ebuild, + -pulse2-mmc-plugins-1.2.4_p819.ebuild, + +pulse2-mmc-plugins-1.2.4_p819-r1.ebuild, + +files/pulse2-mmc-plugins-1.2.4-install-target-1.patch, + +files/pulse2-mmc-plugins-1.2.4-python-fix-1.patch: + delete old and make it python abi compatible + 18 Feb 2010; Mario Fetka pulse2-mmc-plugins-1.2.0.ebuild, pulse2-mmc-plugins-1.2.0-r1.ebuild, pulse2-mmc-plugins-1.2.1_p761.ebuild, diff --git a/app-admin/pulse2-mmc-plugins/Manifest b/app-admin/pulse2-mmc-plugins/Manifest index 840a178..9154a28 100644 --- a/app-admin/pulse2-mmc-plugins/Manifest +++ b/app-admin/pulse2-mmc-plugins/Manifest @@ -1,13 +1,6 @@ -DIST pulse2-mmc-plugins-1.2.0.tar.gz 132136 RMD160 e3c85e87c7f51768311584ca17b32c7277866fcf SHA1 c0705b608f0fb448fc858c80d311d52dcde0cbc9 SHA256 395f4e12d537eb8063e23fd1d2152bcb3a8326933bb7aa0074f8cf34a97cc2ec -DIST pulse2-mmc-plugins-1.2.1-761.tar.gz 117249 RMD160 57a9516b393ca5e180bcade804c7d6e52526f743 SHA1 c8a88983b326d02add3efe061e636ba100809235 SHA256 3a727848123eb687eb1ed9ac429bdbfecc2eabaca91c639afbcea410d72c22b3 -DIST pulse2-mmc-plugins-1.2.2-776.tar.gz 117535 RMD160 fef51a644b83a9aab8377badd2742e99e7fb3d54 SHA1 3c247ffd4d1b736dd3b2d2537c77171a37aaecef SHA256 01b421ea2e4f57aed1e0368f1a7fa70a31ddf84f241c0ec819f27deebb35daea -DIST pulse2-mmc-plugins-1.2.3-790.tar.gz 117637 RMD160 f3096d23b0643bb02bc3821ee943a309794ae3ee SHA1 69e2fc0b2f9903cc23e2039dffeabe99d74c35b8 SHA256 34c6353579bfd8dc17e89f13f2befd32cd126305fcb174f3b586bb59eb488d82 +AUX pulse2-mmc-plugins-1.2.4-install-target-1.patch 1662 RMD160 42105a041a9e015258be33c7f5830b3d5f3404d6 SHA1 5b25e1588241732619248995300e7cc4960b752e SHA256 ce3e86cf27d01f1600e3faa8824ab531a7ad0b0cb289db55bd9bd9345c6baec4 +AUX pulse2-mmc-plugins-1.2.4-python-fix-1.patch 1300 RMD160 4a47e9f4397a351817f99a7741f9956474ec9ec3 SHA1 867627e2be3642ebc6c1763c626bc0d7bef67f91 SHA256 bdb6fb6f1f88007209cb66af15bf09d0835723acab9bb7ed1d7e68f0d23c070a DIST pulse2-mmc-plugins-1.2.4-819.tar.gz 119471 RMD160 94fe0ebd155addf527d3c813c1280642568477a8 SHA1 e5e7ad4efedd15aa2fba2e42cd7205bd9026f15e SHA256 ff9977caa0d2f53a912b9fe3ef87c39596dbf24d0ab01655069e516eace73ed6 -EBUILD pulse2-mmc-plugins-1.2.0-r1.ebuild 1190 RMD160 2b152718b8900e93f68fa2e5b4d1f0379a768ab2 SHA1 c6fca98af5d9fc4989e09d146f84139557025819 SHA256 bf608ab372d0bd0c85cb7b32458a2aff08e2586456c958446f3329398f91d340 -EBUILD pulse2-mmc-plugins-1.2.0.ebuild 1242 RMD160 ff79bd5c3997be6f73a3b44c6018d1cb483c30c9 SHA1 722872bfd5fc508e7851eb87a9c1bc947d18862e SHA256 b2bed9cf8f91a82ee83e8e25def3a360652c6b2d302bbff217be6305050dccd9 -EBUILD pulse2-mmc-plugins-1.2.1_p761.ebuild 1274 RMD160 f720694f8c8adee5799e6d96b1a38e07c0caa5c9 SHA1 545a2964a311e203f6e8ef4271f86a0c0fd94e8e SHA256 57b957119050accb5fffc2de2c632319e5b46e72f9a7d747f84aa94cfeefccd9 -EBUILD pulse2-mmc-plugins-1.2.2_p776.ebuild 1274 RMD160 5fc67f4ee74ac470a6f775adf3cd876d10a8b61a SHA1 f7ef315bfb72af9950162e1b92f0d4d19a809786 SHA256 145e0e97f8aa497b7e3a4024b91cdf870269bb9aedc727bca6cdd924fa649ed4 -EBUILD pulse2-mmc-plugins-1.2.3_p790.ebuild 1274 RMD160 5fc67f4ee74ac470a6f775adf3cd876d10a8b61a SHA1 f7ef315bfb72af9950162e1b92f0d4d19a809786 SHA256 145e0e97f8aa497b7e3a4024b91cdf870269bb9aedc727bca6cdd924fa649ed4 -EBUILD pulse2-mmc-plugins-1.2.4_p819.ebuild 1274 RMD160 5fc67f4ee74ac470a6f775adf3cd876d10a8b61a SHA1 f7ef315bfb72af9950162e1b92f0d4d19a809786 SHA256 145e0e97f8aa497b7e3a4024b91cdf870269bb9aedc727bca6cdd924fa649ed4 -MISC ChangeLog 1672 RMD160 080697bbd5058769eaac820f59e3c018e73efc4a SHA1 071bd69a3f91035ca686914cd581f0be371e938b SHA256 c7bf3317f53745dcf70415560505eaac2cff09b913e5b4d81d3e4749f60f2c61 +EBUILD pulse2-mmc-plugins-1.2.4_p819-r1.ebuild 926 RMD160 b8b5fb7afa2001a23134010d9d3a2317c12714c5 SHA1 7f106bba1724b27b07b591e620a2c7d791fd41fb SHA256 15c8b075c87673488db726be1f2f96a0ee9724f1c309793fdd22bc4c3463fc10 +MISC ChangeLog 2164 RMD160 cd7d0559867cea3c1c55c7419651df8dcb5e6f24 SHA1 794bb1507a7d710408ef29e395a7ffa33622c00f SHA256 49c587dcd2349ab70a27dd581147bb224da3d4014ab12c4294cdcf2806effe0b MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 diff --git a/app-admin/pulse2-mmc-plugins/files/pulse2-mmc-plugins-1.2.4-install-target-1.patch b/app-admin/pulse2-mmc-plugins/files/pulse2-mmc-plugins-1.2.4-install-target-1.patch new file mode 100644 index 0000000..871ead8 --- /dev/null +++ b/app-admin/pulse2-mmc-plugins/files/pulse2-mmc-plugins-1.2.4-install-target-1.patch @@ -0,0 +1,47 @@ +Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com) +Date: 2010-05-01 +Initial Package Version: 1.2.4 +Origin: me +Upstream Status: unknown +Description: split the install target + +diff -Naur pulse2-mmc-plugins-1.2.4.orig/Makefile pulse2-mmc-plugins-1.2.4/Makefile +--- pulse2-mmc-plugins-1.2.4.orig/Makefile 2008-11-07 15:45:47.000000000 +0000 ++++ pulse2-mmc-plugins-1.2.4/Makefile 2010-05-01 13:09:08.818871118 +0000 +@@ -36,22 +36,31 @@ + all: + + # Install everything +-install: ++install: install_py install_cfg install_sbin ++ ++install_nopy: install_cfg install_sbin ++ ++install_py: + @# Install directories +- @echo "Creating directories..." +- $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(ETCDIR) ++ @echo "Creating python directories..." + $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(PYTHON_PREFIX) +- $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(SBINDIR) +- + @echo "" + @echo "Install python code in $(DESTDIR)$(PYTHON_PREFIX)" + $(PYTHON) setup.py install --no-compile --prefix $(DESTDIR)$(PYTHON_PREFIX) + ++install_cfg: ++ @# Install directories ++ @echo "Creating config directories..." ++ $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(ETCDIR) + @echo "" + @echo "Install CONFILES in $(DESTDIR)$(ETCDIR)" + $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(ETCDIR)/plugins + $(INSTALL) conf/plugins/* -m 600 -o root -g root $(DESTDIR)$(ETCDIR)/plugins + ++install_sbin: ++ @# Install directories ++ @echo "Creating sbin directories..." ++ $(INSTALL) -d -m 755 -o root -g root $(DESTDIR)$(SBINDIR) + @echo "" + @echo "Install additionnal tools in $(DESTDIR)$(SBINDIR)" + $(INSTALL) $(SBINFILES) -m 755 -o root -g root $(DESTDIR)$(SBINDIR) diff --git a/app-admin/pulse2-mmc-plugins/files/pulse2-mmc-plugins-1.2.4-python-fix-1.patch b/app-admin/pulse2-mmc-plugins/files/pulse2-mmc-plugins-1.2.4-python-fix-1.patch new file mode 100644 index 0000000..aef8452 --- /dev/null +++ b/app-admin/pulse2-mmc-plugins/files/pulse2-mmc-plugins-1.2.4-python-fix-1.patch @@ -0,0 +1,25 @@ +Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com) +Date: 2010-05-01 +Initial Package Version: 1.2.4 +Origin: me +Upstream Status: unknown +Description: dont install mmc & mmc.plugins we depend on mmc-core + +diff -Naur pulse2-mmc-plugins-1.2.4.orig/setup.py pulse2-mmc-plugins-1.2.4/setup.py +--- pulse2-mmc-plugins-1.2.4.orig/setup.py 2010-05-01 13:17:00.944617298 +0000 ++++ pulse2-mmc-plugins-1.2.4/setup.py 2010-05-01 13:17:41.329870713 +0000 +@@ -30,12 +30,9 @@ + author_email = "cdelfosse@mandriva.com", + maintainer = "Cedric Delfosse", + maintainer_email = "cdelfosse@mandriva.com", +- packages = ["mmc", "mmc.plugins", +- "mmc.plugins.dyngroup", "mmc.plugins.dyngroup.querymanager", ++ packages = ["mmc.plugins.dyngroup", "mmc.plugins.dyngroup.querymanager", + "mmc.plugins.glpi", "mmc.plugins.glpi.querymanager", +- "mmc.plugins.imaging", +- "mmc.plugins.pulse2", +- "mmc.plugins.pkgs", ++ "mmc.plugins.imaging", "mmc.plugins.pulse2", "mmc.plugins.pkgs", + "mmc.plugins.inventory", "mmc.plugins.inventory.querymanager", + "mmc.plugins.inventory.provisioning_plugins", + "mmc.plugins.inventory.provisioning_plugins.network_to_entity", diff --git a/app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.0-r1.ebuild b/app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.0-r1.ebuild deleted file mode 100644 index f865a7d..0000000 --- a/app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.0-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit distutils - -DESCRIPTION="Open Source Computer System Management and its Python plugins." -HOMEPAGE="http://pulse2.mandriva.org/" -SRC_URI="http://pulse2.mandriva.org/pub/pulse2/sources/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="nls" - -SLOT="0" - -RDEPEND=">=dev-python/twisted-web-0.7.0 - >=app-admin/pulse2-common-1.2.0 - >=app-admin/mmc-agent-2.3.1" - -DEPEND=">=dev-python/setuptools-0.6_rc1" - -# from marienz's setuptools.eclass: -src_install() { - "${python}" setup.py install --root="${D}" --no-compile "$@" || die "install failed" - insinto etc/mmc/plugins - doins -r conf/plugins/*.ini || die "ini install failed" - insinto usr/share/doc/${P} - doins -r contrib || die "config samples install failed" - dodoc Changelog - python_version - # we need to remove this file because it collides with the one - # from mmc-agent (which we depend on). - rm "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mmc/__init__.py" - rm "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mmc/plugins/__init__.py" -} - diff --git a/app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.0.ebuild b/app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.0.ebuild deleted file mode 100644 index 313261c..0000000 --- a/app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit distutils - -DESCRIPTION="Open Source Computer System Management and its Python plugins." -HOMEPAGE="http://pulse2.mandriva.org/" -SRC_URI="http://mds.mandriva.org/pub/pulse2/sources/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="nls" - -SLOT="0" - -RDEPEND=">=dev-python/twisted-web-0.7.0 - >=app-admin/pulse2-common-1.2.0 - >=app-admin/mmc-agent-2.3.1" - -DEPEND=">=dev-python/setuptools-0.6_rc1" - -# from marienz's setuptools.eclass: -src_install() { - "${python}" setup.py install --root="${D}" --no-compile "$@" || die "install failed" - insinto etc/mmc/plugins - doins -r conf/plugins/*.ini || die "ini install failed" - insinto usr/share/doc/${P} - doins -r contrib || die "config samples install failed" - dodoc Changelog - python_version - # we need to remove this file because it collides with the one - # from mmc-agent (which we depend on). - rm "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mmc/__init__.py" - rm "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mmc/plugins/__init__.py" -} - -src_test() { - "${python}" setup.py test || die "tests failed" -} - diff --git a/app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.1_p761.ebuild b/app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.1_p761.ebuild deleted file mode 100644 index 882609a..0000000 --- a/app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.1_p761.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit distutils - -MY_P="${P/_p/-}" -MY_PV="${PV/_p*/}" - -DESCRIPTION="Open Source Computer System Management and its Python plugins." -HOMEPAGE="http://pulse2.mandriva.org/" -SRC_URI="http://pulse2.mandriva.org/pub/pulse2/server/sources/${MY_PV}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="nls" - -SLOT="0" - -RDEPEND=">=dev-python/twisted-web-0.7.0 - >=app-admin/pulse2-common-${MY_PV} - >=app-admin/mmc-agent-2.3.1" - -DEPEND=">=dev-python/setuptools-0.6_rc1" - -S="${WORKDIR}/${PN}-${MY_PV}" - -# from marienz's setuptools.eclass: -src_install() { - "${python}" setup.py install --root="${D}" --no-compile "$@" || die "install failed" - insinto etc/mmc/plugins - doins -r conf/plugins/*.ini || die "ini install failed" - insinto usr/share/doc/${P} - doins -r contrib || die "config samples install failed" - dodoc Changelog - python_version - # we need to remove this file because it collides with the one - # from mmc-agent (which we depend on). - rm "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mmc/__init__.py" - rm "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mmc/plugins/__init__.py" -} - diff --git a/app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.2_p776.ebuild b/app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.2_p776.ebuild deleted file mode 100644 index bb709de..0000000 --- a/app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.2_p776.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit distutils - -MY_P="${P/_p/-}" -MY_PV="${PV/_p*/}" - -DESCRIPTION="Open Source Computer System Management and its Python plugins." -HOMEPAGE="http://pulse2.mandriva.org/" -SRC_URI="http://pulse2.mandriva.org/pub/pulse2/server/sources/${MY_PV}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="nls" - -SLOT="0" - -RDEPEND=">=dev-python/twisted-web-0.7.0 - >=app-admin/pulse2-common-${MY_PV} - >=app-admin/mmc-agent-2.3.2" - -DEPEND=">=dev-python/setuptools-0.6_rc1" - -S="${WORKDIR}/${PN}-${MY_PV}" - -# from marienz's setuptools.eclass: -src_install() { - "${python}" setup.py install --root="${D}" --no-compile "$@" || die "install failed" - insinto etc/mmc/plugins - doins -r conf/plugins/*.ini || die "ini install failed" - insinto usr/share/doc/${P} - doins -r contrib || die "config samples install failed" - dodoc Changelog - python_version - # we need to remove this file because it collides with the one - # from mmc-agent (which we depend on). - rm "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mmc/__init__.py" - rm "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mmc/plugins/__init__.py" -} - diff --git a/app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.3_p790.ebuild b/app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.3_p790.ebuild deleted file mode 100644 index bb709de..0000000 --- a/app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.3_p790.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit distutils - -MY_P="${P/_p/-}" -MY_PV="${PV/_p*/}" - -DESCRIPTION="Open Source Computer System Management and its Python plugins." -HOMEPAGE="http://pulse2.mandriva.org/" -SRC_URI="http://pulse2.mandriva.org/pub/pulse2/server/sources/${MY_PV}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="nls" - -SLOT="0" - -RDEPEND=">=dev-python/twisted-web-0.7.0 - >=app-admin/pulse2-common-${MY_PV} - >=app-admin/mmc-agent-2.3.2" - -DEPEND=">=dev-python/setuptools-0.6_rc1" - -S="${WORKDIR}/${PN}-${MY_PV}" - -# from marienz's setuptools.eclass: -src_install() { - "${python}" setup.py install --root="${D}" --no-compile "$@" || die "install failed" - insinto etc/mmc/plugins - doins -r conf/plugins/*.ini || die "ini install failed" - insinto usr/share/doc/${P} - doins -r contrib || die "config samples install failed" - dodoc Changelog - python_version - # we need to remove this file because it collides with the one - # from mmc-agent (which we depend on). - rm "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mmc/__init__.py" - rm "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mmc/plugins/__init__.py" -} - diff --git a/app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.4_p819-r1.ebuild b/app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.4_p819-r1.ebuild new file mode 100644 index 0000000..567ab94 --- /dev/null +++ b/app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.4_p819-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" +SUPPORT_PYTHON_ABIS="1" + +inherit eutils distutils + +MY_P="${P/_p/-}" +MY_PV="${PV/_p*/}" + +DESCRIPTION="Open Source Computer System Management and its Python plugins." +HOMEPAGE="http://pulse2.mandriva.org/" +SRC_URI="http://pulse2.mandriva.org/pub/pulse2/server/sources/${MY_PV}/${MY_P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="nls" + +SLOT="0" + +RDEPEND=">=dev-python/twisted-web-0.7.0 + >=app-admin/pulse2-common-${MY_PV} + >=app-admin/mmc-core-2.3.2" + +S="${WORKDIR}/${PN}-${MY_PV}" + +src_prepare() { + epatch "${FILESDIR}"/pulse2-mmc-plugins-1.2.4-install-target-1.patch + epatch "${FILESDIR}"/pulse2-mmc-plugins-1.2.4-python-fix-1.patch + distutils_src_prepare +} + +src_install() { + emake install_nopy PREFIX=/usr DESTDIR=${D} + distutils_src_install +} + diff --git a/app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.4_p819.ebuild b/app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.4_p819.ebuild deleted file mode 100644 index bb709de..0000000 --- a/app-admin/pulse2-mmc-plugins/pulse2-mmc-plugins-1.2.4_p819.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit distutils - -MY_P="${P/_p/-}" -MY_PV="${PV/_p*/}" - -DESCRIPTION="Open Source Computer System Management and its Python plugins." -HOMEPAGE="http://pulse2.mandriva.org/" -SRC_URI="http://pulse2.mandriva.org/pub/pulse2/server/sources/${MY_PV}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="nls" - -SLOT="0" - -RDEPEND=">=dev-python/twisted-web-0.7.0 - >=app-admin/pulse2-common-${MY_PV} - >=app-admin/mmc-agent-2.3.2" - -DEPEND=">=dev-python/setuptools-0.6_rc1" - -S="${WORKDIR}/${PN}-${MY_PV}" - -# from marienz's setuptools.eclass: -src_install() { - "${python}" setup.py install --root="${D}" --no-compile "$@" || die "install failed" - insinto etc/mmc/plugins - doins -r conf/plugins/*.ini || die "ini install failed" - insinto usr/share/doc/${P} - doins -r contrib || die "config samples install failed" - dodoc Changelog - python_version - # we need to remove this file because it collides with the one - # from mmc-agent (which we depend on). - rm "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mmc/__init__.py" - rm "${D}/usr/$(get_libdir)/python${PYVER}/site-packages/mmc/plugins/__init__.py" -} -