From: Caleb Tennis Date: Thu, 16 Mar 2006 13:51:28 +0000 (+0000) Subject: Migrate to modular X X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=69e01aec1b7486226b53da59bd6d189ef87fb8e5;p=gentoo.git Migrate to modular X Package-Manager: portage-2.1_pre6-r3 --- diff --git a/dev-db/sqsh/ChangeLog b/dev-db/sqsh/ChangeLog index b6e0a5fcdd66..59f77d274a78 100644 --- a/dev-db/sqsh/ChangeLog +++ b/dev-db/sqsh/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-db/sqsh -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/sqsh/ChangeLog,v 1.16 2005/04/21 20:49:03 blubb Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/sqsh/ChangeLog,v 1.17 2006/03/16 13:51:28 caleb Exp $ + + 16 Mar 2006; Caleb Tennis sqsh-2.1-r1.ebuild, + -sqsh-2.1.3.ebuild, sqsh-2.1.3-r1.ebuild: + Migrate to modular X 21 Apr 2005; Simon Stelling sqsh-2.1-r1.ebuild: stable on amd64 diff --git a/dev-db/sqsh/Manifest b/dev-db/sqsh/Manifest index bb650dfac55e..f4a55ae6f1d6 100644 --- a/dev-db/sqsh/Manifest +++ b/dev-db/sqsh/Manifest @@ -1,8 +1,18 @@ -MD5 ca45b9dc4752285afc55c4eb86248cd1 ChangeLog 2670 -MD5 1e775f96d6dfeba2439d8deb1b7e13cd sqsh-2.1-r1.ebuild 942 -MD5 848f7e962020305524f90eae3dff338c metadata.xml 586 -MD5 ac9a9acebef00c7a445fa7dcbb1dacd5 sqsh-2.1.3.ebuild 966 -MD5 b905a9e18256c329949a41772bab1da4 sqsh-2.1.3-r1.ebuild 970 -MD5 dd2d4502b402ce862b6f636d95e90f0a files/digest-sqsh-2.1.3 62 +MD5 1223f4ffe4ba1d79e5d0054c2ecdc1d1 ChangeLog 2805 +RMD160 b4be32426a866c1af039faf6ff27bdda1513fe93 ChangeLog 2805 +SHA256 8a14bb1b419143c4ca3f009ce8d8c24a60f8a07cf7f0a857a4c7e496b679be97 ChangeLog 2805 MD5 19272f9055a78c6035e2f605dad0268c files/digest-sqsh-2.1-r1 64 +RMD160 8cc7622661d23593b512564b32d8a187a97f2725 files/digest-sqsh-2.1-r1 64 +SHA256 5f725cbf41733d865fe85a6d01302336a5a735a8008ff00a576bfffff7c9e7dd files/digest-sqsh-2.1-r1 64 MD5 9e1d41d12a21ceabb8123c86b4d83d1e files/digest-sqsh-2.1.3-r1 135 +RMD160 23ca4c0aabe5844a7905794526ab7622d52982fc files/digest-sqsh-2.1.3-r1 135 +SHA256 1e7cd9ef27c83efe0c92ade9e840c11ff971a2cc2ef0fc3eaab22929612d9570 files/digest-sqsh-2.1.3-r1 135 +MD5 848f7e962020305524f90eae3dff338c metadata.xml 586 +RMD160 fcc8bcc76e516b380dbe550f5381fe4157bf3fa6 metadata.xml 586 +SHA256 6cc20dd8a6d5f9283356ab35df60e15bd28e94c343c6173ba11b80838da9c83c metadata.xml 586 +MD5 5b7abfbb519c692b94d83d9d279178ae sqsh-2.1-r1.ebuild 1044 +RMD160 b70769222ef8250f31e7e7ed2bce7fc6eb6c7fb7 sqsh-2.1-r1.ebuild 1044 +SHA256 8ecccf4991f0085fd512dbe31caa815eb8a4e0b4f3dedc8724a94f53940d96bc sqsh-2.1-r1.ebuild 1044 +MD5 5bb977a9012f968c88bf2408ccfb8aaa sqsh-2.1.3-r1.ebuild 1070 +RMD160 a234e5f88b42df074694dc9aef14f97360eadf7a sqsh-2.1.3-r1.ebuild 1070 +SHA256 ca6d43ecf9dd32dc9317b85a8ce4f0060e10db62707236e375a94677a008008d sqsh-2.1.3-r1.ebuild 1070 diff --git a/dev-db/sqsh/files/digest-sqsh-2.1.3 b/dev-db/sqsh/files/digest-sqsh-2.1.3 deleted file mode 100644 index 4524e6edf4d0..000000000000 --- a/dev-db/sqsh/files/digest-sqsh-2.1.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 baa61acdfe04eebf1f2fc7ed27810218 sqsh-2.1.3.tar.gz 408940 diff --git a/dev-db/sqsh/sqsh-2.1-r1.ebuild b/dev-db/sqsh/sqsh-2.1-r1.ebuild index 493b6075e263..0df3bcd80290 100644 --- a/dev-db/sqsh/sqsh-2.1-r1.ebuild +++ b/dev-db/sqsh/sqsh-2.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/sqsh/sqsh-2.1-r1.ebuild,v 1.12 2005/04/21 20:49:03 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/sqsh/sqsh-2.1-r1.ebuild,v 1.13 2006/03/16 13:51:28 caleb Exp $ inherit eutils @@ -15,7 +15,13 @@ KEYWORDS="x86 amd64" DEPEND="dev-db/freetds readline? ( sys-libs/readline ) - X? ( virtual/x11 ) + X? ( || ( ( + x11-libs/libXaw + x11-libs/libXt + x11-libs/libXext + x11-libs/libXmu + x11-libs/libX11 ) + virtual/x11 ) ) motif? ( x11-libs/openmotif ) virtual/libc" diff --git a/dev-db/sqsh/sqsh-2.1.3-r1.ebuild b/dev-db/sqsh/sqsh-2.1.3-r1.ebuild index 332d61a58699..450eb771c48d 100644 --- a/dev-db/sqsh/sqsh-2.1.3-r1.ebuild +++ b/dev-db/sqsh/sqsh-2.1.3-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/sqsh/sqsh-2.1.3-r1.ebuild,v 1.1 2005/04/11 18:59:29 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/sqsh/sqsh-2.1.3-r1.ebuild,v 1.2 2006/03/16 13:51:28 caleb Exp $ inherit eutils @@ -16,7 +16,13 @@ KEYWORDS="~x86 ~amd64" DEPEND="dev-db/freetds readline? ( sys-libs/readline ) - X? ( virtual/x11 ) + X? ( || ( ( + x11-libs/libXaw + x11-libs/libXt + x11-libs/libXext + x11-libs/libXmu + x11-libs/libX11 ) + virtual/x11 ) ) motif? ( x11-libs/openmotif ) virtual/libc" diff --git a/dev-db/sqsh/sqsh-2.1.3.ebuild b/dev-db/sqsh/sqsh-2.1.3.ebuild deleted file mode 100644 index 9ff7b2b61ead..000000000000 --- a/dev-db/sqsh/sqsh-2.1.3.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/sqsh/sqsh-2.1.3.ebuild,v 1.2 2005/04/07 04:05:55 mr_bones_ Exp $ - -inherit eutils - -DESCRIPTION="Replacement for the venerable 'isql' program supplied by Sybase." -HOMEPAGE="http://sourceforge.net/projects/sqsh/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -IUSE="readline X motif" -KEYWORDS="~x86 ~amd64" - -DEPEND="dev-db/freetds - readline? ( sys-libs/readline ) - X? ( virtual/x11 ) - motif? ( x11-libs/openmotif ) - virtual/libc" - -src_compile() { - export SYBASE=/usr - - local myconf - - use motif && myconf="--with-motif" - - econf \ - $(use_with readline) \ - $(use_with X x) \ - ${myconf} || die - - emake \ - SQSHRC_GLOBAL=/etc/sqshrc || die -} - -src_install () { - einstall \ - SQSHRC_GLOBAL=${D}/etc/sqshrc || die - - make man_dir=${D}/usr/share/man install.man || die - dodoc INSTALL README doc/* -}