Drop version using virtual/x11 and port old to Modular X.

Package-Manager: portage-2.1.2.2

5 files changed, 31 insertions, 66 deletions

diff --git a/xfce-extra/terminal/ChangeLog b/xfce-extra/terminal/ChangeLog
index 0fffebe0d9f0..2b66596ab14e 100644
--- a/xfce-extra/terminal/ChangeLog
+++ b/xfce-extra/terminal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-extra/terminal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/ChangeLog,v 1.37 2007/03/10 18:55:29 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/ChangeLog,v 1.38 2007/03/11 10:34:11 drac Exp $
+
+  11 Mar 2007; Samuli Suominen <drac@gentoo.org> terminal-0.2.4.ebuild,
+  -terminal-0.2.4-r1.ebuild:
+  Drop version using virtual/x11 and port old to Modular X.
 
   10 Mar 2007; nixnut <nixnut@gentoo.org> terminal-0.2.6-r1.ebuild:
   Stable on ppc wrt bug 169987
diff --git a/xfce-extra/terminal/Manifest b/xfce-extra/terminal/Manifest
index eb1cf52ec470..a2a87ec942f7 100644
--- a/xfce-extra/terminal/Manifest
+++ b/xfce-extra/terminal/Manifest
@@ -1,21 +1,17 @@
 DIST Terminal-0.2.4.tar.bz2 1008348 RMD160 1c01548ab4e208c9dd423155cf43fd42acb47a1c SHA1 8787f574469ec47cba9786d64fa5803fd28dd3b3 SHA256 211919ed901670e11c1d7c8c82309b15d28b5da8e73cc722f8d03bd4bedf14ef
 DIST Terminal-0.2.6.tar.bz2 1582076 RMD160 0e1bcb66b83a92044eae891c35cc3750918ca83e SHA1 8851179492c4768a1a53d2424d7a7c8b1a873c58 SHA256 a1dcb1a86e79780acb1f3548466eba1fb03a9d9e9bd31e6ff3496b07504e53d8
-EBUILD terminal-0.2.4-r1.ebuild 866 RMD160 85aa6bf243a699559e58387d194de593fe1f16be SHA1 a65bde0b1ddbd95932e4def7571133ea7dc6e576 SHA256 1bcc95315e034a02e3b5616e5102d1ad1544bb8a610bf1c1991f44d7609eaf7d
-MD5 9a955ddbcfa9ff270de06fd70a25ae36 terminal-0.2.4-r1.ebuild 866
-RMD160 85aa6bf243a699559e58387d194de593fe1f16be terminal-0.2.4-r1.ebuild 866
-SHA256 1bcc95315e034a02e3b5616e5102d1ad1544bb8a610bf1c1991f44d7609eaf7d terminal-0.2.4-r1.ebuild 866
-EBUILD terminal-0.2.4.ebuild 698 RMD160 0f6f3c38178795a01cfa1f4b4cfff2cbddc41417 SHA1 008e8e95a7b3d7bde39c112de400f62bf153eaf1 SHA256 aa661c8a5d8a9e35e2b4d4bfbcf55ef9b14af81d5d723b05d3ac2143bad54433
-MD5 4cd8acf761924473890434e7bdad68da terminal-0.2.4.ebuild 698
-RMD160 0f6f3c38178795a01cfa1f4b4cfff2cbddc41417 terminal-0.2.4.ebuild 698
-SHA256 aa661c8a5d8a9e35e2b4d4bfbcf55ef9b14af81d5d723b05d3ac2143bad54433 terminal-0.2.4.ebuild 698
+EBUILD terminal-0.2.4.ebuild 801 RMD160 d2c54a2d1bc9057df02c42b1e1004dc26a165779 SHA1 e355e1435ee13945806308b424fe26351457e794 SHA256 bf5c3a1292b1857bf214b3c6acb2b93ab6424664bc676584fbb1e5c8b8574901
+MD5 b6a52cef1ffb56e23a0ada6d071e6931 terminal-0.2.4.ebuild 801
+RMD160 d2c54a2d1bc9057df02c42b1e1004dc26a165779 terminal-0.2.4.ebuild 801
+SHA256 bf5c3a1292b1857bf214b3c6acb2b93ab6424664bc676584fbb1e5c8b8574901 terminal-0.2.4.ebuild 801
 EBUILD terminal-0.2.6-r1.ebuild 1120 RMD160 63c64f9943f17ca19376736dccea3cd055364b84 SHA1 6108fbcb18ddfd15dd6e29881d6d5070418872f8 SHA256 614f21e01256d2f8cf579c65d93cbf01f7153acdfcd8178cd7d160880a4159ac
 MD5 93321f8c5b1eb4ecc105a43c3418a7a1 terminal-0.2.6-r1.ebuild 1120
 RMD160 63c64f9943f17ca19376736dccea3cd055364b84 terminal-0.2.6-r1.ebuild 1120
 SHA256 614f21e01256d2f8cf579c65d93cbf01f7153acdfcd8178cd7d160880a4159ac terminal-0.2.6-r1.ebuild 1120
-MISC ChangeLog 4970 RMD160 d852bc546f125e9d8f1887de21b5be8b8850baa5 SHA1 617706cc97f0472d8eb28dacc63b7b2a5e58a5b0 SHA256 4f2ffa9be0f14c9f98000e88432e465aba1fdec5df4239a059a62d75ed205c69
-MD5 d3d53313a546fdcca8451157d1ab60b9 ChangeLog 4970
-RMD160 d852bc546f125e9d8f1887de21b5be8b8850baa5 ChangeLog 4970
-SHA256 4f2ffa9be0f14c9f98000e88432e465aba1fdec5df4239a059a62d75ed205c69 ChangeLog 4970
+MISC ChangeLog 5130 RMD160 5677efa40e693f7ac3dc8a1ec8c7f17e035b0a14 SHA1 7ec56a3f274bc7cdd779801e2cb5fbfa49339b10 SHA256 f77851a7c8c169c568d8ee6f909313a943fb712e29ab1d750884fe556cf972b1
+MD5 0ac143c1af5d488cb8d58b697f544f28 ChangeLog 5130
+RMD160 5677efa40e693f7ac3dc8a1ec8c7f17e035b0a14 ChangeLog 5130
+SHA256 f77851a7c8c169c568d8ee6f909313a943fb712e29ab1d750884fe556cf972b1 ChangeLog 5130
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157
@@ -23,9 +19,6 @@ SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 metadata
 MD5 29a9d960f31ad519c377b7de7270939f files/digest-terminal-0.2.4 250
 RMD160 32dddb1d096a3f0b2059abaa698fc8b02234f0e1 files/digest-terminal-0.2.4 250
 SHA256 cbfbb3a45196c62e73df7749bc02b260fdd06d2d0db3c998ecf1b063f064e3d3 files/digest-terminal-0.2.4 250
-MD5 29a9d960f31ad519c377b7de7270939f files/digest-terminal-0.2.4-r1 250
-RMD160 32dddb1d096a3f0b2059abaa698fc8b02234f0e1 files/digest-terminal-0.2.4-r1 250
-SHA256 cbfbb3a45196c62e73df7749bc02b260fdd06d2d0db3c998ecf1b063f064e3d3 files/digest-terminal-0.2.4-r1 250
 MD5 11e1c953a8c670847b7178b398491074 files/digest-terminal-0.2.6-r1 250
 RMD160 a71a4c2887c1a87e52ec059a2235d97b811925f0 files/digest-terminal-0.2.6-r1 250
 SHA256 70eec5d6c5e1ee55b7310a2d198f864d8279114c6b3a7f53205d56592247b610 files/digest-terminal-0.2.6-r1 250
diff --git a/xfce-extra/terminal/files/digest-terminal-0.2.4-r1 b/xfce-extra/terminal/files/digest-terminal-0.2.4-r1
deleted file mode 100644
index b263d9d8426b..000000000000
--- a/xfce-extra/terminal/files/digest-terminal-0.2.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d9f8c9db0a27c4d304e1c4fd2ca3a371 Terminal-0.2.4.tar.bz2 1008348
-RMD160 1c01548ab4e208c9dd423155cf43fd42acb47a1c Terminal-0.2.4.tar.bz2 1008348
-SHA256 211919ed901670e11c1d7c8c82309b15d28b5da8e73cc722f8d03bd4bedf14ef Terminal-0.2.4.tar.bz2 1008348
diff --git a/xfce-extra/terminal/terminal-0.2.4-r1.ebuild b/xfce-extra/terminal/terminal-0.2.4-r1.ebuild
deleted file mode 100644
index 0926ff1126c6..000000000000
--- a/xfce-extra/terminal/terminal-0.2.4-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/terminal-0.2.4-r1.ebuild,v 1.7 2007/03/03 14:38:06 nixnut Exp $
-
-inherit xfce42
-
-DESCRIPTION="Terminal with close ties to xfce"
-HOMEPAGE="http://www.os-cillation.com/"
-KEYWORDS="~amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
-
-IUSE="dbus"
-
-RDEPEND="|| ( ( x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXft )
-	virtual/x11 )
-	>=x11-libs/gtk+-2.4
-	>=xfce-extra/exo-0.3.0-r1
-	dbus? ( || 	( >=dev-libs/dbus-glib-0.71
-				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
-	)
-	>=x11-libs/vte-0.11.11
-	x11-libs/startup-notification
-	>=xfce-base/libxfce4mcs-4.2.2-r1"
-
-MY_P="${PN/t/T}-${PV/_/}"
-bzipped
-goodies
-S=${WORKDIR}/${MY_P}
-
-
-if ! use dbus; then
-	XFCE_CONFIG="--disable-dbus"
-fi
diff --git a/xfce-extra/terminal/terminal-0.2.4.ebuild b/xfce-extra/terminal/terminal-0.2.4.ebuild
index db9595a82cd3..028b5df94289 100644
--- a/xfce-extra/terminal/terminal-0.2.4.ebuild
+++ b/xfce-extra/terminal/terminal-0.2.4.ebuild
@@ -1,27 +1,34 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/terminal-0.2.4.ebuild,v 1.9 2006/12/06 05:51:45 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/terminal/terminal-0.2.4.ebuild,v 1.10 2007/03/11 10:34:11 drac Exp $
 
-DESCRIPTION="Terminal with close ties to xfce"
+inherit xfce42
+
+DESCRIPTION="Terminal"
 HOMEPAGE="http://www.os-cillation.com/"
 KEYWORDS="~amd64 arm ia64 ppc ppc64 ~sparc x86"
-
 IUSE="dbus"
 
-RDEPEND=">=x11-libs/gtk+-2.4
-	>=xfce-extra/exo-0.3.0_pre1
+RDEPEND="x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXft
+	>=x11-libs/gtk+-2.4
+	=xfce-extra/exo-0.3*
 	dbus? ( || 	( >=dev-libs/dbus-glib-0.71
 				( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.34 ) )
 	)
 	>=x11-libs/vte-0.11.11
-	>=xfce-base/libxfce4mcs-4.2.0"
+	x11-libs/startup-notification
+	=xfce-base/libxfce4mcs-4.2*"
 
 MY_P="${PN/t/T}-${PV/_/}"
-BZIPPED=1
-GOODIES=1
+bzipped
+goodies
+S=${WORKDIR}/${MY_P}
+
 
 if ! use dbus; then
 	XFCE_CONFIG="--disable-dbus"
 fi
-
-inherit xfce4