From: Steve Dibb Date: Mon, 11 Dec 2006 18:12:08 +0000 (+0000) Subject: Remove silverxp use flag (bug 157443), fix xinerama deps (bug 157737), remove old... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fe1cf09f14e5ad6f766610aed1ffd779397e3c00;p=gentoo.git Remove silverxp use flag (bug 157443), fix xinerama deps (bug 157737), remove old version Package-Manager: portage-2.1.1-r2 --- diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest index 25ce9b2d26e3..99ebb7665fab 100644 --- a/x11-wm/icewm/Manifest +++ b/x11-wm/icewm/Manifest @@ -10,42 +10,29 @@ AUX icewm-1.2.23.ybutton.cc.patch 591 RMD160 1ade595dadaaa5494b84e4ba6ce76c88eb9 MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.23.ybutton.cc.patch 591 RMD160 1ade595dadaaa5494b84e4ba6ce76c88eb900e5d files/icewm-1.2.23.ybutton.cc.patch 591 SHA256 2a5f61bfba0affa9734a6ce167db2b76a2750033db69e7ae692d8c8ab3b1324a files/icewm-1.2.23.ybutton.cc.patch 591 -AUX icewm-1.2.25-gcc41.patch 608 RMD160 dab0e7d33df2c277de8a9430c0dfebcd6049e7de SHA1 b56060b8c717d3068139a9f47000365da26054f6 SHA256 bfe473799b8564da15bbe2b00779dc472c9c854d827d70ba5efe005219770027 -MD5 50083fec82eb79a039a23fb96bad2fc7 files/icewm-1.2.25-gcc41.patch 608 -RMD160 dab0e7d33df2c277de8a9430c0dfebcd6049e7de files/icewm-1.2.25-gcc41.patch 608 -SHA256 bfe473799b8564da15bbe2b00779dc472c9c854d827d70ba5efe005219770027 files/icewm-1.2.25-gcc41.patch 608 -AUX icewm-1.2.25.ybutton.cc.patch 591 RMD160 1ade595dadaaa5494b84e4ba6ce76c88eb900e5d SHA1 06e69c11ae755863cdddd4386400e5f4d2e40c4b SHA256 2a5f61bfba0affa9734a6ce167db2b76a2750033db69e7ae692d8c8ab3b1324a -MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.25.ybutton.cc.patch 591 -RMD160 1ade595dadaaa5494b84e4ba6ce76c88eb900e5d files/icewm-1.2.25.ybutton.cc.patch 591 -SHA256 2a5f61bfba0affa9734a6ce167db2b76a2750033db69e7ae692d8c8ab3b1324a files/icewm-1.2.25.ybutton.cc.patch 591 AUX icewm-1.2.26.ybutton.cc.patch 591 RMD160 1ade595dadaaa5494b84e4ba6ce76c88eb900e5d SHA1 06e69c11ae755863cdddd4386400e5f4d2e40c4b SHA256 2a5f61bfba0affa9734a6ce167db2b76a2750033db69e7ae692d8c8ab3b1324a MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.26.ybutton.cc.patch 591 RMD160 1ade595dadaaa5494b84e4ba6ce76c88eb900e5d files/icewm-1.2.26.ybutton.cc.patch 591 SHA256 2a5f61bfba0affa9734a6ce167db2b76a2750033db69e7ae692d8c8ab3b1324a files/icewm-1.2.26.ybutton.cc.patch 591 DIST icewm-1.2.23.tar.gz 1017090 RMD160 0b82deca8750b2dd82502e2911656d9204b84ea4 SHA1 122baeaaaa9fee90abfe50c66636df6d78d22deb SHA256 af8917fedafe0f58b78b0e009918dfdea4c901f07925ec025e4cfb2e9bfd2332 -DIST icewm-1.2.25.tar.gz 1042790 RMD160 58bab630875aea02c64c2ca9bcbe80cf2338cdb3 SHA1 04d3555ec0c2e0fc4e782893f6b1ca8d5dfdcacd SHA256 b0971c6f79a1642eda06cdb79e022a05168f8031e408cc96e367318c9c5f97fa DIST icewm-1.2.26.tar.gz 1042824 RMD160 fca3e3e9c11da971aff132a34cfbf0c8f3a15599 SHA1 8cd941ae0d70a8175bfd8e1e1c4f6658c6caf1fa SHA256 96ed51cbaead5bd8c33522be5bf0baac4c051db0a826f764eb8528b2ec0c5497 DIST icewm-1.2.29.tar.gz 1055906 RMD160 ac77e10d365852998bfef0c5d2a9181acfc7ec64 SHA1 185d5c118e6f7aeabe8666508f39422714904cf2 SHA256 2be1b9c96c621cf3cdd56ec84d536ba2a04768098f08547a5ab7195a18a85dc3 EBUILD icewm-1.2.23.ebuild 2383 RMD160 4640d7e938d046821284730bb3e38335900f480e SHA1 337883efcf7fb7132fcef63cf5c7ef07bd9f4ffd SHA256 55eb0a14974fba82974fbbd46b81e7cbe1ffec0acbbe4b5164d5f7878e278f04 MD5 8d616d4a1cfcf1f2428214e4f5cb6d86 icewm-1.2.23.ebuild 2383 RMD160 4640d7e938d046821284730bb3e38335900f480e icewm-1.2.23.ebuild 2383 SHA256 55eb0a14974fba82974fbbd46b81e7cbe1ffec0acbbe4b5164d5f7878e278f04 icewm-1.2.23.ebuild 2383 -EBUILD icewm-1.2.25.ebuild 2387 RMD160 97b1bf0107e2f039e1e778c41bb51959e56c9a32 SHA1 8037bf54ee1af7bfa6d030fc33151f0dca4cf91e SHA256 5c42cbc0aa27a153578b64201210e40fec26ee41bb70423c6302162712720813 -MD5 8c737a1636b5690016cc556d92e1aca3 icewm-1.2.25.ebuild 2387 -RMD160 97b1bf0107e2f039e1e778c41bb51959e56c9a32 icewm-1.2.25.ebuild 2387 -SHA256 5c42cbc0aa27a153578b64201210e40fec26ee41bb70423c6302162712720813 icewm-1.2.25.ebuild 2387 EBUILD icewm-1.2.26.ebuild 2350 RMD160 04a142bc2f31d67e35746e94535b6ed261bcca30 SHA1 1c5172c28c7c4b4431bdadf56e7f6446e2d3007f SHA256 a222066379dc011c9cd33479eb9893ed761869488337c67fcb62de64c2a1f28d MD5 b63669e020d2f775834a4dab8321d1a0 icewm-1.2.26.ebuild 2350 RMD160 04a142bc2f31d67e35746e94535b6ed261bcca30 icewm-1.2.26.ebuild 2350 SHA256 a222066379dc011c9cd33479eb9893ed761869488337c67fcb62de64c2a1f28d icewm-1.2.26.ebuild 2350 -EBUILD icewm-1.2.29.ebuild 2349 RMD160 4f2a54dadfd32e35616f853e7d777e69195b4342 SHA1 61eb5c85115ef42264c571c25f03de3679fcf63f SHA256 10713293db7aab85ee0d60637773ad8517ab6666fa39244168a1c9116d18a0bf -MD5 950029ed6afbd756b8ca606240c57382 icewm-1.2.29.ebuild 2349 -RMD160 4f2a54dadfd32e35616f853e7d777e69195b4342 icewm-1.2.29.ebuild 2349 -SHA256 10713293db7aab85ee0d60637773ad8517ab6666fa39244168a1c9116d18a0bf icewm-1.2.29.ebuild 2349 -MISC ChangeLog 18113 RMD160 a2440da5722c6fc201678dbeea2b99afd0e2f384 SHA1 21140f22fb7fb18fb405f35c9bff1f91a6b5c155 SHA256 0bc7931343322ee3f404dd45f9a1567a590155c76924c8c5fb477eb089baa2b4 -MD5 86d75300f4b357617a52db0adf056136 ChangeLog 18113 -RMD160 a2440da5722c6fc201678dbeea2b99afd0e2f384 ChangeLog 18113 -SHA256 0bc7931343322ee3f404dd45f9a1567a590155c76924c8c5fb477eb089baa2b4 ChangeLog 18113 +EBUILD icewm-1.2.29.ebuild 2272 RMD160 4a91e5cf199850fa1d1fca17b09eb7be49cce250 SHA1 10405ef7fb8350f491be11fd70f486acbda54cd6 SHA256 2563fe90c52ae503b92765246b8d994b6aebc9f0496bd117537725b09546681f +MD5 58a9f975949926a2765e1255564984af icewm-1.2.29.ebuild 2272 +RMD160 4a91e5cf199850fa1d1fca17b09eb7be49cce250 icewm-1.2.29.ebuild 2272 +SHA256 2563fe90c52ae503b92765246b8d994b6aebc9f0496bd117537725b09546681f icewm-1.2.29.ebuild 2272 +MISC ChangeLog 18373 RMD160 ac781a1db9d1ce0a6c8cf8962688f1936c5c2fc7 SHA1 a086092b3379257ed04098130155601b93d57a63 SHA256 b9bf5456631ccea66399d730f79d50e10960e8240c2d64019f5971449b0f5a91 +MD5 20acc296419f39b9d8175591b806de63 ChangeLog 18373 +RMD160 ac781a1db9d1ce0a6c8cf8962688f1936c5c2fc7 ChangeLog 18373 +SHA256 b9bf5456631ccea66399d730f79d50e10960e8240c2d64019f5971449b0f5a91 ChangeLog 18373 MISC metadata.xml 568 RMD160 6af034687e9596288f7212e543ac221460451987 SHA1 ef2e580fcbd02a68f12b6b0e5852fa57960a2b2c SHA256 32e899e5a1c5b0150d12a9a23f007c04394c33752f951ad48968438257742b00 MD5 886e6581c64785183696413e8902c022 metadata.xml 568 RMD160 6af034687e9596288f7212e543ac221460451987 metadata.xml 568 @@ -53,9 +40,6 @@ SHA256 32e899e5a1c5b0150d12a9a23f007c04394c33752f951ad48968438257742b00 metadata MD5 1589c61593233935ffe12f634011ff41 files/digest-icewm-1.2.23 241 RMD160 f839213d2374ff2343eef024c2bd1d98bd6142b7 files/digest-icewm-1.2.23 241 SHA256 af8d9194743b5e7189f9970e6d3304140d70d78b4f18a4b3aeb869c36bdcbf3b files/digest-icewm-1.2.23 241 -MD5 7ac15125978a7d74b831baad4a1d0807 files/digest-icewm-1.2.25 241 -RMD160 9fceccb15a08e608f5a4d49f5ae6cf90dab2a6b8 files/digest-icewm-1.2.25 241 -SHA256 5e0f35eedf89314f542276cd7576f7f238e7784a42356cd0afcb1312b96ae73d files/digest-icewm-1.2.25 241 MD5 4b90404369ae31ce9020a00f373677e4 files/digest-icewm-1.2.26 241 RMD160 8826a3f82060f32d94c5f45b03a512ecad7f221b files/digest-icewm-1.2.26 241 SHA256 d30b3dc41ff73cc6d8258b862aa8143190102097bc26c5b372c35eba09db73e2 files/digest-icewm-1.2.26 241 diff --git a/x11-wm/icewm/files/digest-icewm-1.2.25 b/x11-wm/icewm/files/digest-icewm-1.2.25 deleted file mode 100644 index 1eaef6bcb480..000000000000 --- a/x11-wm/icewm/files/digest-icewm-1.2.25 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 af69d095a6c6fba1f73f80e966bc4459 icewm-1.2.25.tar.gz 1042790 -RMD160 58bab630875aea02c64c2ca9bcbe80cf2338cdb3 icewm-1.2.25.tar.gz 1042790 -SHA256 b0971c6f79a1642eda06cdb79e022a05168f8031e408cc96e367318c9c5f97fa icewm-1.2.25.tar.gz 1042790 diff --git a/x11-wm/icewm/files/icewm-1.2.25-gcc41.patch b/x11-wm/icewm/files/icewm-1.2.25-gcc41.patch deleted file mode 100644 index eba1c2bfffb2..000000000000 --- a/x11-wm/icewm/files/icewm-1.2.25-gcc41.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- icewm-1.2.25/src/ylocale.cc.orig 2006-04-08 19:03:17.000000000 -0500 -+++ icewm-1.2.25/src/ylocale.cc 2006-04-08 19:04:46.000000000 -0500 -@@ -152,7 +152,7 @@ YUChar *YLocale::unicodeString(const YLC - char * inbuf((char *) lStr), * outbuf((char *) uStr); - size_t inlen(lLen), outlen(4 * lLen); - -- if (0 > (int) iconv(instance->toUnicode, const_cast(&inbuf), &inlen, &outbuf, &outlen)) -+ if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen)) - warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno)); - - *((YUChar *) outbuf) = 0; diff --git a/x11-wm/icewm/files/icewm-1.2.25.ybutton.cc.patch b/x11-wm/icewm/files/icewm-1.2.25.ybutton.cc.patch deleted file mode 100644 index 2eeb379ecb41..000000000000 --- a/x11-wm/icewm/files/icewm-1.2.25.ybutton.cc.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ybutton.cc.orig 2004-11-07 13:49:19.926827944 -0600 -+++ ybutton.cc 2004-11-07 13:49:30.113279368 -0600 -@@ -103,8 +103,7 @@ - g.setColor(surface.color); - - if (wmLook == lookMetal) { -- g.drawBorderM(x, y, w - 1, h - 1, !d); -- d = 0; x += 2; y += 2; w -= 4; h -= 4; -+ d=0; - } else if (wmLook == lookGtk) { - g.drawBorderG(x, y, w - 1, h - 1, !d); - x += 1 + d; y += 1 + d; w -= 3; h -= 3; -@@ -114,7 +113,6 @@ - } - - paint(g, d, YRect(x, y, w, h)); -- paintFocus(g, YRect(x, y, w, h)); - } - } - diff --git a/x11-wm/icewm/icewm-1.2.25.ebuild b/x11-wm/icewm/icewm-1.2.25.ebuild deleted file mode 100644 index dad45e69f512..000000000000 --- a/x11-wm/icewm/icewm-1.2.25.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.25.ebuild,v 1.2 2006/11/19 02:45:23 compnerd Exp $ - -inherit eutils - -DESCRIPTION="Ice Window Manager with Themes" - -HOMEPAGE="http://www.icewm.org/ - http://sourceforge.net/projects/icewmsilverxp/" - -#fix for icewm preversion package names -S=${WORKDIR}/${P/_} - -SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" - -KEYWORDS="~amd64 ~ppc ~sparc ~x86" - -IUSE="esd imlib nls spell truetype xinerama silverxp" - -RDEPEND="|| ( ( - x11-libs/libXau - x11-libs/libX11 - x11-libs/libXrandr - x11-libs/libXext - x11-libs/libXpm - x11-libs/libXrender - x11-libs/libXft - x11-libs/libXt - x11-libs/libXdmcp ) - virtual/x11 ) - esd? ( media-sound/esound ) - imlib? ( >=media-libs/imlib-1.9.10-r1 ) - nls? ( sys-devel/gettext ) - truetype? ( >=media-libs/freetype-2.0.9 ) - media-fonts/artwiz-fonts - media-libs/giflib" - -DEPEND="${RDEPEND} - || ( ( - x11-proto/xproto - x11-proto/xextproto - x11-proto/xineramaproto ) - virtual/x11 ) - >=sys-apps/sed-4" - -src_unpack() { - unpack ${A} - epatch ${FILESDIR}/${P}-gcc41.patch - - cd ${S}/src - if use silverxp ; then - epatch ${FILESDIR}/${P/_}.ybutton.cc.patch - fi - - echo "#!/bin/sh" > $T/icewm - echo "/usr/bin/icewm-session" >> $T/icewm - -} - -src_compile(){ - - if use truetype - then - myconf="${myconf} --enable-gradients --enable-shape --enable-movesize-fx --enable-shaped-decorations" - else - myconf="${myconf} --disable-xfreetype --enable-corefonts" - fi - - CXXFLAGS="${CXXFLAGS}" econf \ - --with-libdir=/usr/share/icewm \ - --with-cfgdir=/etc/icewm \ - --with-docdir=/usr/share/doc/${PF}/html \ - $(use_with esd esd-config /usr/bin/esd-config) \ - $(use_enable nls) \ - $(use_enable nls i18n) \ - $(use_with imlib) \ - $(use_enable spell GtkSpell) \ - $(use_enable x86 x86-asm) \ - $(use_enable xinerama) \ - ${myconf} || die "configure failed" - - sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed" - sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed" - - emake || die "emake failed" -} - -src_install(){ - make DESTDIR=${D} install || die "make install failed" - - dodoc AUTHORS BUGS CHANGES FAQ PLATFORMS README* TODO VERSION - dohtml -a html,sgml doc/* - - exeinto /etc/X11/Sessions - doexe $T/icewm - - insinto /usr/share/xsessions - doins ${FILESDIR}/IceWM.desktop -}