Change to using virtual/cdrtools for bug #147880, cleaning up older ebuilds, and adding dependency for virtual/cdrtools if USE=dvdr, also.

(Portage version: 2.1.1)
 (Signed Manifest commit)

9 files changed, 25 insertions, 280 deletions

diff --git a/net-misc/pxes/Manifest b/net-misc/pxes/Manifest
index eeef05558ce6..b81e67cd2249 100644
--- a/net-misc/pxes/Manifest
+++ b/net-misc/pxes/Manifest
@@ -1,39 +1,31 @@
-MD5 9c4d5e3532e483eb1ef140c642cc4b90 ChangeLog 4188
-RMD160 83684d734abe8c58648b893677cb280c58125634 ChangeLog 4188
-SHA256 26e60d184479a6e3ee1cabae120aa98a14a95d669b3c272cf66729774182810e ChangeLog 4188
-MD5 1708574c57ea3dbb43faa2a5abe17a5d files/digest-pxes-0.6-r4 206
-RMD160 5b1f267a5525aaa2c11be16aa39d52658b792202 files/digest-pxes-0.6-r4 206
-SHA256 45f5365d378caa1cc76d02b31b8aa11f8c74e4727488f289b4497fb821ff825d files/digest-pxes-0.6-r4 206
-MD5 587792f4ed87b201b12047186b3c19c4 files/digest-pxes-0.7 208
-RMD160 380bc312eac7232547b9efaa656bdab15fab33ef files/digest-pxes-0.7 208
-SHA256 61b66de9d83953ae86f976e0d5a45022f427e26a29d4bb88a698fec702975abe files/digest-pxes-0.7 208
-MD5 b491b02f1152ab8f37c398206f16cbfd files/digest-pxes-0.8 142
-RMD160 df53b87abd7929698d8c3bf777f228ec131dbc4c files/digest-pxes-0.8 142
-SHA256 7dcaa258d167e80c60f1bac29284a8f8852ed1798b2c33662863a5a17f73f951 files/digest-pxes-0.8 142
-MD5 c26357ce69d1a5de2b37834c63e91833 files/digest-pxes-0.9-r1 142
-RMD160 685d7168de54a642b8bf96eb46d55a8df95ee44b files/digest-pxes-0.9-r1 142
-SHA256 d8ba793834bd5a00d6cb9cb950ac964eff971cdd61a45dea22273efdcd8d0062 files/digest-pxes-0.9-r1 142
-MD5 cd62bae9012dcfb2741b0d78ab20dd5b files/digest-pxes-1.0 142
-RMD160 fc756bdef8416393a255f3d0946a488250b3fca5 files/digest-pxes-1.0 142
-SHA256 77a2cc36e44b7a41fa0ffba49072f235ccabc54a9b9b3d89ccf93d1c9aa87d07 files/digest-pxes-1.0 142
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX makedevices.sh 1626 RMD160 92e90e92afc5b1639053a3fee39aaed88cf0eb63 SHA1 783fc1d0a664f194970b0706de9aac12eb0c092c SHA256 fd1ce228372408fc2971d991eca68b03ae8baa8969506a75c64245401404bf51
 MD5 f3afb0ef2357d69147125eeb6cda6c43 files/makedevices.sh 1626
 RMD160 92e90e92afc5b1639053a3fee39aaed88cf0eb63 files/makedevices.sh 1626
 SHA256 fd1ce228372408fc2971d991eca68b03ae8baa8969506a75c64245401404bf51 files/makedevices.sh 1626
+DIST pxes-base-i586-1.0-6.tar.gz 22922664
+DIST pxesconfig-1.0-7.tar.gz 399159
+EBUILD pxes-1.0.ebuild 1750 RMD160 0d943cd1a242600e7cd16da9ef6846117d1855de SHA1 a45dd5d6d916cbcaa3396bf21378cff712c5d467 SHA256 a3856eae2c575cf53665150261a66a3582c6e698d732034603d760c0b6b499fc
+MD5 0ba5f615654a99de805afc136a895347 pxes-1.0.ebuild 1750
+RMD160 0d943cd1a242600e7cd16da9ef6846117d1855de pxes-1.0.ebuild 1750
+SHA256 a3856eae2c575cf53665150261a66a3582c6e698d732034603d760c0b6b499fc pxes-1.0.ebuild 1750
+MISC ChangeLog 4483 RMD160 02b39a09dbccaa7cba39d530cc7d3d9552fd748f SHA1 ad0aee010d519919dc0d5e774080fc52b5e956ef SHA256 e55ad0090509eed856aef789bb91d2bfb4adb236e8f72b805eb276d21434ed01
+MD5 993c6e5826d4a401b9001c68111d09e5 ChangeLog 4483
+RMD160 02b39a09dbccaa7cba39d530cc7d3d9552fd748f ChangeLog 4483
+SHA256 e55ad0090509eed856aef789bb91d2bfb4adb236e8f72b805eb276d21434ed01 ChangeLog 4483
+MISC metadata.xml 645 RMD160 6f7d26f1c40f61497d79dcca9793c181cff71174 SHA1 96f2ed2d56f1f7e5340d6d528a7be0067af9f2f3 SHA256 937e327c6d3813d5a89bcbf948fdecf68c48a40130cb2478c9f419e143b83c62
 MD5 dc3371c7348c1a1e429a032198b6db20 metadata.xml 645
 RMD160 6f7d26f1c40f61497d79dcca9793c181cff71174 metadata.xml 645
 SHA256 937e327c6d3813d5a89bcbf948fdecf68c48a40130cb2478c9f419e143b83c62 metadata.xml 645
-MD5 ae78ee4aa3490278ab40ff9f767055f0 pxes-0.6-r4.ebuild 1384
-RMD160 b54f7320989ec56a487acf4ce19e9e09e59cb884 pxes-0.6-r4.ebuild 1384
-SHA256 80e992dc977c6614f422f53abaafa03f14923c28231acbe044fc6cf6748ea6d2 pxes-0.6-r4.ebuild 1384
-MD5 51c70ec72ee5a8ff58d6f3da9fdd37a5 pxes-0.7.ebuild 1466
-RMD160 d773d87d59808b6be3fc48070e3aa476f1762229 pxes-0.7.ebuild 1466
-SHA256 02e09a323ee8399e11b14ce089fe717ea5054b6f20e7e6ff3b0f108b8c0c500c pxes-0.7.ebuild 1466
-MD5 1b9190ecb68db2c997eecd0fe43b53e1 pxes-0.8.ebuild 1261
-RMD160 2a8ebf77c4ed3979a18fad585cfdf556dfb818a8 pxes-0.8.ebuild 1261
-SHA256 dedfbea4f33a991bf21e61f3c285475832e32a551d469c57ec173f131bc8b238 pxes-0.8.ebuild 1261
-MD5 418e9077e55f4687b69f40b1ad21aa1e pxes-0.9-r1.ebuild 1737
-RMD160 0b813820772f2d775ff7e1650204c4faf2b5a62d pxes-0.9-r1.ebuild 1737
-SHA256 20eca86eed38ca109724ee966be8fac9234efb2c764709c587ca225c1fc252db pxes-0.9-r1.ebuild 1737
-MD5 219a1776af0404806cc2692cad449994 pxes-1.0.ebuild 1718
-RMD160 b1c6fbf0896c39c0c03daac30bcbc4723c5f5b8c pxes-1.0.ebuild 1718
-SHA256 77597aefd1fd4ecdcdc333ecce7b98949ea8c58d22bc64ed789454d11ab6fac9 pxes-1.0.ebuild 1718
+MD5 cd62bae9012dcfb2741b0d78ab20dd5b files/digest-pxes-1.0 142
+RMD160 fc756bdef8416393a255f3d0946a488250b3fca5 files/digest-pxes-1.0 142
+SHA256 77a2cc36e44b7a41fa0ffba49072f235ccabc54a9b9b3d89ccf93d1c9aa87d07 files/digest-pxes-1.0 142
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFDqmekT4lNIS36YERArIHAKC8C1H7ufiba2+t/Un35Iclmh0I6wCgogOg
+LQsfczOBTVoIo0Th101xTIc=
+=O7ba
+-----END PGP SIGNATURE-----
diff --git a/net-misc/pxes/files/digest-pxes-0.6-r4 b/net-misc/pxes/files/digest-pxes-0.6-r4
deleted file mode 100644
index 4bc8fee8bb17..000000000000
--- a/net-misc/pxes/files/digest-pxes-0.6-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 819e3a730e8f2304b96e04994ca7a0a6 pxes-base-i586-0.6-4.tar.gz 12482691
-MD5 7a86be8d7dcf9e13f61f63d3d2ceee75 pxesconfig-0.6-4.tar.gz 803619
-MD5 1ee01ea37c265eb3037339a7d5a0630f pxes-ltsp-0.6.tar.gz 14498
diff --git a/net-misc/pxes/files/digest-pxes-0.7 b/net-misc/pxes/files/digest-pxes-0.7
deleted file mode 100644
index fc073b60c6ed..000000000000
--- a/net-misc/pxes/files/digest-pxes-0.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f256e6bc75e0a4dd5ccbf28affead74d pxes-base-i586-0.7-1.tar.gz 14312040
-MD5 3d046dcb25e562a06752f2953cc271ec pxesconfig-0.7-1.tar.gz 245827
-MD5 4020d88286d78a1b04cd9a58a4609a93 pxes-ltsp-0.7-1.tar.gz 14513
diff --git a/net-misc/pxes/files/digest-pxes-0.8 b/net-misc/pxes/files/digest-pxes-0.8
deleted file mode 100644
index 821fe05dfc16..000000000000
--- a/net-misc/pxes/files/digest-pxes-0.8
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 51667641606cf643d56f68228003f7e0 pxes-base-i586-0.8-9.tar.gz 14661896
-MD5 95dc5840d650c4fe734e48154b9d159f pxesconfig-0.8-9.tar.gz 246763
diff --git a/net-misc/pxes/files/digest-pxes-0.9-r1 b/net-misc/pxes/files/digest-pxes-0.9-r1
deleted file mode 100644
index e8843d157755..000000000000
--- a/net-misc/pxes/files/digest-pxes-0.9-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 30a377fe5c227afda4704aa3dda155b5 pxes-base-i586-0.9-1.tar.gz 18861795
-MD5 b5886c6b87db968c8385f88948552d97 pxesconfig-0.9-1.tar.gz 357379
diff --git a/net-misc/pxes/pxes-0.6-r4.ebuild b/net-misc/pxes/pxes-0.6-r4.ebuild
deleted file mode 100644
index 1e334d60d2d5..000000000000
--- a/net-misc/pxes/pxes-0.6-r4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pxes/pxes-0.6-r4.ebuild,v 1.15 2005/11/28 13:13:26 mcummings Exp $
-
-inherit perl-app
-
-IUSE="cdr ltsp"
-DESCRIPTION="PXES is a package for building thin clients using multiple types of clients"
-HOMEPAGE="http://pxes.sourceforge.net"
-SRC_URI="mirror://sourceforge/pxes/${PN}-base-i586-${PV}-4.tar.gz
-	mirror://sourceforge/pxes/pxesconfig-${PV}-4.tar.gz
-	ltsp? ( mirror://sourceforge/pxes/${PN}-ltsp-${PV}.tar.gz )"
-
-KEYWORDS="x86"
-
-SLOT="0"
-LICENSE="GPL-2"
-DEPEND=">=dev-lang/perl-5.8.0-r12
-	ltsp? ( >=net-misc/ltsp-3.0.9-r1 )"
-
-RDEPEND="${DEPEND}
-	dev-perl/gtk-perl
-	>=dev-perl/glade-perl-0.61
-	cdr? ( app-cdr/cdrtools )"
-
-RESTRICT="nouserpriv"
-
-dir=/opt/${P}
-Ddir=${D}/${dir}
-
-src_unpack() {
-	unpack ${A}
-
-	use ltsp && unpack ${PN}-ltsp-${PV}.tar.gz
-}
-
-src_compile() {
-	cd ${WORKDIR}/pxesconfig-${PV}
-	perl-app_src_compile || die
-}
-
-src_install() {
-	dodir ${dir}
-	cp -pPR ${S}/stock ${Ddir}
-	cp -pPR ${S}/tftpboot ${D}
-	dodoc Documentation/ChangeLog
-	dohtml -r Documentation/html/*
-	exeinto ${dir}
-	doexe ${FILESDIR}/makedevices.sh
-	cd ${WORKDIR}/pxesconfig-${PV}
-	perl-module_src_install || die
-	dosym /usr/bin/cpio /bin/cpio
-}
-
-#pkg_postinst() {
-#	${dir}/makedevices.sh
-#}
-
-#pkg_prerm() {
-#	rm -rf ${dir}/stock/{dist,initrd}/dev
-#}
diff --git a/net-misc/pxes/pxes-0.7.ebuild b/net-misc/pxes/pxes-0.7.ebuild
deleted file mode 100644
index e85103fa6db7..000000000000
--- a/net-misc/pxes/pxes-0.7.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pxes/pxes-0.7.ebuild,v 1.12 2005/11/28 13:13:26 mcummings Exp $
-
-inherit perl-app
-
-IUSE="cdr ltsp"
-DESCRIPTION="PXES is a package for building thin clients using multiple types of clients"
-HOMEPAGE="http://pxes.sourceforge.net"
-SRC_URI="mirror://sourceforge/pxes/${PN}-base-i586-${PV}-1.tar.gz
-	mirror://sourceforge/pxes/pxesconfig-${PV}-1.tar.gz
-	ltsp? ( mirror://sourceforge/pxes/${PN}-ltsp-${PV}-1.tar.gz )"
-
-KEYWORDS="x86"
-
-SLOT="0"
-LICENSE="GPL-2"
-DEPEND=">=dev-lang/perl-5.8.0-r12
-	ltsp? ( >=net-misc/ltsp-3.0.9-r1 )"
-
-RDEPEND="${DEPEND}
-	dev-perl/gtk-perl
-	>=dev-perl/glade-perl-0.61
-	cdr? ( app-cdr/cdrtools )"
-
-RESTRICT="nouserpriv"
-
-dir=/opt/${P}
-Ddir=${D}/${dir}
-
-src_unpack() {
-	unpack ${A}
-	use ltsp && unpack ${PN}-ltsp-${PV}-1.tar.gz
-}
-
-src_compile() {
-	cd ${WORKDIR}/pxesconfig-${PV}
-	SRC_PREP="yes"
-	perl Makefile.PL PREFIX=${D}/usr INSTALLDIRS=vendor DESTDIR=${D}
-	perl-app_src_compile || die
-}
-
-src_install() {
-	dodir ${dir}
-	cp -pPR ${S}/stock ${Ddir}
-	cp -pPR ${S}/tftpboot ${D}
-	dodoc Documentation/ChangeLog
-	dohtml -r Documentation/html/*
-	exeinto ${dir}
-	doexe ${FILESDIR}/makedevices.sh
-	cd ${WORKDIR}/pxesconfig-${PV}
-	perl-module_src_install || die
-	dosym /usr/bin/cpio /bin/cpio
-}
-
-#pkg_postinst() {
-#	${dir}/makedevices.sh
-#}
-
-#pkg_prerm() {
-#	rm -rf ${dir}/stock/{dist,initrd}/dev
-#}
diff --git a/net-misc/pxes/pxes-0.8.ebuild b/net-misc/pxes/pxes-0.8.ebuild
deleted file mode 100644
index 67f6cbc45c5d..000000000000
--- a/net-misc/pxes/pxes-0.8.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pxes/pxes-0.8.ebuild,v 1.11 2005/11/28 13:13:26 mcummings Exp $
-
-inherit perl-app
-
-IUSE="cdr"
-DESCRIPTION="PXES is a package for building thin clients using multiple types of clients"
-HOMEPAGE="http://pxes.sourceforge.net"
-SRC_URI="mirror://sourceforge/pxes/${PN}-base-i586-${PV}-9.tar.gz
-	mirror://sourceforge/pxes/pxesconfig-${PV}-9.tar.gz"
-
-KEYWORDS="x86"
-
-SLOT="0"
-LICENSE="GPL-2"
-DEPEND=">=dev-lang/perl-5.8.0-r12"
-
-RDEPEND="${DEPEND}
-	dev-perl/gtk-perl
-	>=dev-perl/glade-perl-0.61
-	sys-fs/squashfs-tools
-	cdr? ( app-cdr/cdrtools )"
-
-
-dir=/opt/${P}
-Ddir=${D}/${dir}
-
-src_unpack() {
-	unpack ${A} || die "Unpacking"
-#	use ltsp && unpack ${PN}-ltsp-${PV}-9.tar.gz
-}
-
-src_compile() {
-	cd ${WORKDIR}/pxesconfig-${PV}
-	SRC_PREP="yes"
-	perl Makefile.PL PREFIX=${D}/usr INSTALLDIRS=vendor DESTDIR=${D}
-	perl-app_src_compile || die
-}
-
-src_install() {
-	dodir ${dir}
-	cd ${Ddir}
-	cp -r ${S}/stock ${Ddir} || die "Copying files"
-	cp -pPR ${S}/tftpboot ${D}
-	dodoc Documentation/ChangeLog
-	dohtml -r Documentation/html/*
-	cd ${WORKDIR}/pxesconfig-${PV}
-	perl-module_src_install || die
-	dosym /usr/bin/cpio /bin/cpio
-}
diff --git a/net-misc/pxes/pxes-0.9-r1.ebuild b/net-misc/pxes/pxes-0.9-r1.ebuild
deleted file mode 100644
index 077695be21ab..000000000000
--- a/net-misc/pxes/pxes-0.9-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/pxes/pxes-0.9-r1.ebuild,v 1.5 2006/03/20 21:12:27 wolf31o2 Exp $
-
-inherit eutils perl-app
-
-IUSE="cdr"
-MY_PV=${PV}-1
-DESCRIPTION="PXES is a package for building thin clients using multiple types of clients"
-HOMEPAGE="http://pxes.sourceforge.net"
-SRC_URI="mirror://sourceforge/pxes/${PN}-base-i586-${MY_PV}.tar.gz
-	mirror://sourceforge/pxes/pxesconfig-${MY_PV}.tar.gz"
-
-KEYWORDS="amd64 x86"
-
-SLOT="0"
-LICENSE="GPL-2"
-DEPEND=">=dev-lang/perl-5.8.0-r12"
-
-RDEPEND="${DEPEND}
-	dev-perl/gtk-perl
-	>=dev-perl/glade-perl-0.61
-	sys-fs/squashfs-tools
-	cdr? ( app-cdr/cdrtools )"
-
-dir=/opt/${P}
-Ddir=${D}/${dir}
-
-die_from_busted_gtk-perl() {
-	ewarn "PXES requires that gtk-perl was built with USE=gnome. You can"
-	ewarn "fix this by doing the following:"
-	echo
-	einfo "mkdir -p /etc/portage"
-	einfo "echo 'dev-perl/gtk-perl gnome' >> /etc/portage/package.use"
-	einfo "emerge --oneshot dev-perl/gtk-perl"
-	die "gtk-perl requires USE=gnome"
-}
-
-pkg_setup() {
-	built_with_use dev-perl/gtk-perl gnome || die_from_busted_gtk-perl
-}
-
-src_compile() {
-	cd ${WORKDIR}/pxesconfig-${PV}
-	SRC_PREP="yes"
-	perl Makefile.PL PREFIX=${D}/usr INSTALLDIRS=vendor DESTDIR=${D}
-	perl-app_src_compile || die
-}
-
-src_install() {
-	dodir ${dir}
-	cp -r ${S}/stock ${Ddir} || die "Copying files"
-	cp -pPR ${S}/tftpboot ${D} || die "Copying tftpboot"
-	dodir ${dir}/tools
-	dosym /usr/bin/mksquashfs ${dir}/tools/mksquashfs
-	dodoc Documentation/ChangeLog
-	dohtml -r Documentation/html/*
-	cd ${WORKDIR}/pxesconfig-${PV}
-	perl-module_src_install || die
-	# Cleanup from improper install
-	cp -r ${D}/${D}/usr ${D}
-	rm -rf ${D}/var
-}