Dropping imlib useflag for gnome-1.x removal

Package-Manager: portage-2.1.2_rc2

diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index 273202047d51350a862f9715d90010a282eadc6f..bd702c13b65d8712a32dcbd3d292cac75ecb9198 100644 (file)
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/fvwm
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.132 2006/11/18 11:19:35 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.133 2006/11/19 02:27:20 compnerd Exp $
+
+  19 Nov 2006; <compnerd@gentoo.org> fvwm-2.5.16.ebuild, fvwm-2.5.18.ebuild:
+  Dropping imlib useflag for gnome-1.x removal
 
   18 Nov 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   fvwm-2.5.18-r1.ebuild:

diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index c88f53f2b5b0784637e0ca49a782d6d1c5299934..fc17c6db38b985740108d9acd770f898c8a1e091 100644 (file)
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -14,22 +14,22 @@ DIST fvwm-2.5.16-translucent-menus.diff.gz 5022 RMD160 995c1dcd20bd5e4342cb0d2db
 DIST fvwm-2.5.16.tar.bz2 2018815 RMD160 2c0d9c3c1c452d970dbcd4ba4800944714d4c2d4 SHA1 fb12b06bec5992b5d3e640f9a530fe453f5f7a1e SHA256 9fb3f38dfd329b3de1cab0b4e500edd7a2d2fbe11357ef0ca11e052e4ee406d9
 DIST fvwm-2.5.18-translucent-menus.diff.gz 82595 RMD160 175e2dc93ca4e265a5022655deeede32dd653b38 SHA1 58e7120717e9dc581d9c6b61770aa740ef33bcbe SHA256 ffdaf69a93f626a709541e15ecbbb8842c306543beebd4adc909a6edbda42516
 DIST fvwm-2.5.18.tar.bz2 2034340 RMD160 68bd7a5d3e1c5fb3776de0fbda75414d9e7ad54b SHA1 b7ef45dfe3975deab38dd9ae306c5fd280f307c6 SHA256 8489b32ad488d91898d9be0ff4ec4697590feee66f10de88301511efc617e9c5
-EBUILD fvwm-2.5.16.ebuild 6159 RMD160 658af33bac1e80c4668835c55a8bb7bb5632c57c SHA1 0f4910541a82850fec8fd241de12bb0ad81746d6 SHA256 ad2cbe053ef104a72e908b64aa47b406a7b7b5da515a22ad55a943eeebf77812
-MD5 567f2456b8b933cc6971ff7731935a50 fvwm-2.5.16.ebuild 6159
-RMD160 658af33bac1e80c4668835c55a8bb7bb5632c57c fvwm-2.5.16.ebuild 6159
-SHA256 ad2cbe053ef104a72e908b64aa47b406a7b7b5da515a22ad55a943eeebf77812 fvwm-2.5.16.ebuild 6159
+EBUILD fvwm-2.5.16.ebuild 6044 RMD160 7b0f6325e6d7580e12270c915de7f189741a5e7d SHA1 ade996e60f0beef261013cd51cd1fd7a340c5920 SHA256 9e5cd672996936e100badb3ce470ca82541b8adeef15c869883e78c92c581bfb
+MD5 9f5044f4261fce3c6d8aab13c9148e9e fvwm-2.5.16.ebuild 6044
+RMD160 7b0f6325e6d7580e12270c915de7f189741a5e7d fvwm-2.5.16.ebuild 6044
+SHA256 9e5cd672996936e100badb3ce470ca82541b8adeef15c869883e78c92c581bfb fvwm-2.5.16.ebuild 6044
 EBUILD fvwm-2.5.18-r1.ebuild 5427 RMD160 14758bb86462fd4ea0fc6ddf8be2cdbc04e77bcd SHA1 345aacc5ff1aeba1d62b15691ddb6f3b56fd9625 SHA256 14f24fc7ba2f74891bb765616e64e342e11bdffe3254821bb05baae1f381be34
 MD5 85e7a2672c9fff4bdc6872317d9ee991 fvwm-2.5.18-r1.ebuild 5427
 RMD160 14758bb86462fd4ea0fc6ddf8be2cdbc04e77bcd fvwm-2.5.18-r1.ebuild 5427
 SHA256 14f24fc7ba2f74891bb765616e64e342e11bdffe3254821bb05baae1f381be34 fvwm-2.5.18-r1.ebuild 5427
-EBUILD fvwm-2.5.18.ebuild 5297 RMD160 379a7d1cd019e7bb4544774cdeb0a8e1aa2a8ccb SHA1 c16792bc097f0c4229038d82a195cb0bb839d8f7 SHA256 c7453ab45b2d684c0dc28d5b5d51a3c7ab5ae48c8dad4390521617380ba2455f
-MD5 026f50fb0d09ad92417c548e2d610466 fvwm-2.5.18.ebuild 5297
-RMD160 379a7d1cd019e7bb4544774cdeb0a8e1aa2a8ccb fvwm-2.5.18.ebuild 5297
-SHA256 c7453ab45b2d684c0dc28d5b5d51a3c7ab5ae48c8dad4390521617380ba2455f fvwm-2.5.18.ebuild 5297
-MISC ChangeLog 21518 RMD160 ab9c7a45a394c094f99f5f52d64487f6c1a4e6ef SHA1 d541aa9cf89815ef19163eb84365b3a495043e58 SHA256 9738f8e4696568239801cd583b5cf5d8e50549f318001c3d8d9be3b85e968643
-MD5 7bd24b1fdd03b2300de46d81678b593b ChangeLog 21518
-RMD160 ab9c7a45a394c094f99f5f52d64487f6c1a4e6ef ChangeLog 21518
-SHA256 9738f8e4696568239801cd583b5cf5d8e50549f318001c3d8d9be3b85e968643 ChangeLog 21518
+EBUILD fvwm-2.5.18.ebuild 5203 RMD160 2c75904aa1712903f42e8241d4b79c311338b4a2 SHA1 cad278f4f4df9a6877eeaf2c609037db433ed692 SHA256 78dffb7b0369857e12ce23c1446fd60d172a1108e2cd9a5d06bcc614aede23e2
+MD5 b8b6d2edb548865ff0b919d3bfd530a0 fvwm-2.5.18.ebuild 5203
+RMD160 2c75904aa1712903f42e8241d4b79c311338b4a2 fvwm-2.5.18.ebuild 5203
+SHA256 78dffb7b0369857e12ce23c1446fd60d172a1108e2cd9a5d06bcc614aede23e2 fvwm-2.5.18.ebuild 5203
+MISC ChangeLog 21641 RMD160 b0d8ce5322a324c5694889a5b10f94cf4e6c13b9 SHA1 b61d53f48f1545db112349b2c53427ee1ace2064 SHA256 2a2c7701de0cc5f54d4a49cfe12bb48337f38928227f836c7f3da47af31b0595
+MD5 50f499155c20d0e89e524612059060d8 ChangeLog 21641
+RMD160 b0d8ce5322a324c5694889a5b10f94cf4e6c13b9 ChangeLog 21641
+SHA256 2a2c7701de0cc5f54d4a49cfe12bb48337f38928227f836c7f3da47af31b0595 ChangeLog 21641
 MISC metadata.xml 527 RMD160 e50357d85b1410cf8a00f1afad349ed77b986fd7 SHA1 30ccd6474c2e572a1758202aa2a8b5f8edaf843d SHA256 e22df6337e402284589214f91894a06fd29786e4412ffd70845fe1cf86bb1375
 MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527
 RMD160 e50357d85b1410cf8a00f1afad349ed77b986fd7 metadata.xml 527

diff --git a/x11-wm/fvwm/fvwm-2.5.16.ebuild b/x11-wm/fvwm/fvwm-2.5.16.ebuild
index f25283866885f3e1c4daf71f957bd5d72544cee1..8d56fa9d9674cf1d72cfe5246e1fcf8263127ae3 100644 (file)
--- a/x11-wm/fvwm/fvwm-2.5.16.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.16.ebuild,v 1.10 2006/09/19 02:03:02 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.16.ebuild,v 1.11 2006/11/19 02:27:20 compnerd Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,12 +11,10 @@ SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2 mirror://gentoo/fvwm
 LICENSE="GPL-2 FVWM"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="bidi debug gtk imlib nls perl png readline rplay stroke tk truetype xinerama"
+IUSE="bidi debug gtk nls perl png readline rplay stroke tk truetype xinerama"
 
 RDEPEND="readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.3-r1 )
-               gtk? ( =x11-libs/gtk+-1.2*
-                               imlib? ( >=media-libs/gdk-pixbuf-0.21.0
-                                               >=media-libs/imlib-1.9.14-r1 ) )
+               gtk? ( =x11-libs/gtk+-1.2* )
                rplay? ( >=media-sound/rplay-3.3.2 )
                bidi? ( >=dev-libs/fribidi-0.10.4 )
                png? ( >=media-libs/libpng-1.0.12-r2 )
@@ -74,10 +72,8 @@ src_compile() {
        if ! use gtk; then
                myconf="${myconf} --disable-gtk --without-gnome"
        else
-               if ! use imlib; then
-                       einfo "ATTN: You can safely ignore any imlib related configure errors."
-                       myconf="${myconf} --with-imlib-prefix=${T}"
-               fi
+               einfo "ATTN: You can safely ignore any imlib related configure errors."
+               myconf="${myconf} --with-imlib-prefix=${T}"
                myconf="${myconf} --without-gnome"
        fi
 

diff --git a/x11-wm/fvwm/fvwm-2.5.18.ebuild b/x11-wm/fvwm/fvwm-2.5.18.ebuild
index 81ca4dec9280979ef1c4eaa8c6e3c1e98e4f229a..217dad6997bbeb5848dbaca1475275fdc488d36a 100644 (file)
--- a/x11-wm/fvwm/fvwm-2.5.18.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.18.ebuild,v 1.10 2006/11/05 03:39:40 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.18.ebuild,v 1.11 2006/11/19 02:27:20 compnerd Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,12 +11,10 @@ SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2 mirror://gentoo/fvwm
 LICENSE="GPL-2 FVWM"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="bidi debug gtk imlib nls perl png readline rplay stroke tk truetype xinerama"
+IUSE="bidi debug gtk nls perl png readline rplay stroke tk truetype xinerama"
 
 RDEPEND="readline? ( sys-libs/readline sys-libs/ncurses )
-               gtk? ( =x11-libs/gtk+-1.2*
-                               imlib? ( media-libs/gdk-pixbuf
-                                               media-libs/imlib ) )
+               gtk? ( =x11-libs/gtk+-1.2* )
                rplay? ( media-sound/rplay )
                bidi? ( dev-libs/fribidi )
                png? ( media-libs/libpng )
@@ -71,10 +69,8 @@ src_compile() {
        if ! use gtk; then
                myconf="${myconf} --disable-gtk --without-gnome"
        else
-               if ! use imlib; then
-                       einfo "ATTN: You can safely ignore any imlib related configure errors."
-                       myconf="${myconf} --with-imlib-prefix=${T}"
-               fi
+               einfo "ATTN: You can safely ignore any imlib related configure errors."
+               myconf="${myconf} --with-imlib-prefix=${T}"
                myconf="${myconf} --without-gnome"
        fi