diff options
| -rw-r--r-- | media-gfx/gimageview/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/gimageview/Manifest | 22 | ||||
| -rw-r--r-- | media-gfx/gimageview/files/digest-gimageview-0.2.25 | 1 | ||||
| -rw-r--r-- | media-gfx/gimageview/files/digest-gimageview-0.2.26 | 1 | ||||
| -rw-r--r-- | media-gfx/gimageview/gimageview-0.2.25.ebuild | 75 | ||||
| -rw-r--r-- | media-gfx/gimageview/gimageview-0.2.26.ebuild | 65 | ||||
| -rw-r--r-- | media-gfx/gimageview/gimageview-0.2.27-r1.ebuild | 16 |
7 files changed, 16 insertions, 170 deletions
diff --git a/media-gfx/gimageview/ChangeLog b/media-gfx/gimageview/ChangeLog index df7a22624718..fc090202999d 100644 --- a/media-gfx/gimageview/ChangeLog +++ b/media-gfx/gimageview/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/gimageview # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/ChangeLog,v 1.16 2005/04/08 19:59:39 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/ChangeLog,v 1.17 2005/05/29 02:31:07 usata Exp $ + + 29 May 2005; Mamoru KOMACHI <usata@gentoo.org> -gimageview-0.2.25.ebuild, + -gimageview-0.2.26.ebuild, gimageview-0.2.27-r1.ebuild: + Cleaned gtk2 USE flag. This closes bug #92164. 08 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> gimageview-0.2.27-r1.ebuild: diff --git a/media-gfx/gimageview/Manifest b/media-gfx/gimageview/Manifest index 790696a3faa1..e4693bcbff1c 100644 --- a/media-gfx/gimageview/Manifest +++ b/media-gfx/gimageview/Manifest @@ -1,21 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 526389d38327d5dca4da682991421019 gimageview-0.2.26.ebuild 1637 -MD5 e72afff90d4a56241138593039d0b1b6 gimageview-0.2.27-r1.ebuild 1795 -MD5 57ceec6561593844f62bb07a8ad4d8e0 ChangeLog 2193 +MD5 aa3f3d7eb00719a9645be3d7ae9ffa59 ChangeLog 2377 MD5 4368b20da8cb79a90eb16111f691f548 metadata.xml 379 -MD5 7dbdcb559d3684fa9b06ef8b421019c1 gimageview-0.2.25.ebuild 1912 -MD5 fb50f147b01c127505cc2bf9369bbc2a files/gimageview-0.2.27-gtk12_fix.diff 476 -MD5 f74096a129e40fbd3c7a911c3afe461a files/digest-gimageview-0.2.27-r1 70 -MD5 36f65a43da5f087e4bbc63ff7f8adad0 files/digest-gimageview-0.2.25 70 -MD5 89b270a7d0a783ab34544f41c5224819 files/digest-gimageview-0.2.26 70 +MD5 d27b2b803cb2cd3d9135610569c81818 gimageview-0.2.27-r1.ebuild 1861 MD5 9a949f1e3e1aebb680b0b2823db37bf1 files/gimv-gcc34.patch 851 +MD5 f74096a129e40fbd3c7a911c3afe461a files/digest-gimageview-0.2.27-r1 70 +MD5 fb50f147b01c127505cc2bf9369bbc2a files/gimageview-0.2.27-gtk12_fix.diff 476 MD5 e9ac8e8f3e77f9cb035a39c766211170 files/gimageview-0.2.27-sort_fix.diff 920 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCVuLKntT9W3vfTuoRAk1dAJwJwFLeLlHcETa8dPRar3kfczXHkACfZYKI -87kQ/5r5l/fgvc54OVLtEvo= -=NcDU ------END PGP SIGNATURE----- diff --git a/media-gfx/gimageview/files/digest-gimageview-0.2.25 b/media-gfx/gimageview/files/digest-gimageview-0.2.25 deleted file mode 100644 index aa2b8c4c28f5..000000000000 --- a/media-gfx/gimageview/files/digest-gimageview-0.2.25 +++ /dev/null @@ -1 +0,0 @@ -MD5 82874cd6fecdc9833ce3f5745b4bd788 gimageview-0.2.25.tar.gz 1342347 diff --git a/media-gfx/gimageview/files/digest-gimageview-0.2.26 b/media-gfx/gimageview/files/digest-gimageview-0.2.26 deleted file mode 100644 index a34a3d980c55..000000000000 --- a/media-gfx/gimageview/files/digest-gimageview-0.2.26 +++ /dev/null @@ -1 +0,0 @@ -MD5 7d8dc0e122aae6e0a108dba499fe6b69 gimageview-0.2.26.tar.gz 1355845 diff --git a/media-gfx/gimageview/gimageview-0.2.25.ebuild b/media-gfx/gimageview/gimageview-0.2.25.ebuild deleted file mode 100644 index e6e189cd4198..000000000000 --- a/media-gfx/gimageview/gimageview-0.2.25.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.25.ebuild,v 1.8 2005/01/18 11:23:31 usata Exp $ - -inherit eutils gcc - -DESCRIPTION="Powerful GTK+ based image & movie viewer" -HOMEPAGE="http://gtkmmviewer.sourceforge.net/" -SRC_URI="mirror://sourceforge/gtkmmviewer/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ppc ~amd64 ppc64" -# mng, xine, and mplayer are local flags -IUSE="gnome nls gtk gtk2 imlib wmf mng svg xine mplayer" - -DEPEND="virtual/x11 - media-libs/libpng - nls? ( sys-devel/gettext ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - mng? ( >=media-libs/libmng-1.0.3 ) - svg? ( >=gnome-base/librsvg-1.0.3 ) - xine? ( >=media-libs/xine-lib-0.9.13-r3 ) - mplayer? ( >=media-video/mplayer-0.92 ) - gtk? ( gtk2? ( =x11-libs/gtk+-2* ) - !gtk2? ( =x11-libs/gtk+-1.2* ) ) - !gtk? ( || ( - imlib? ( media-libs/imlib ) - media-libs/gdk-pixbuf - ) )" - -src_compile() { - local myconf="" - - if ! use gtk2 && use imlib; then - myconf="--disable-gdk-pixbuf" - else - myconf="--disable-imlib" - fi - - # workaround for gtk+-2.4 - sed -i -e "/GTK_DISABLE_DEPRECATED/d" src/dirview2.c || die - - #apply both patches to compile with gcc-3.4.0 closing bug #53693 - if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ] - then - epatch ${FILESDIR}/gimv-gcc34.patch - fi - - - econf \ - $(use_enable nls) \ - $(use_with wmf libwmf) \ - $(use_with mng libmng) \ - $(use_with svg librsvg) \ - $(use_with xine) \ - $(use_enable mplayer) \ - $(use_with gtk2) \ - ${myconf} --enable-splash || die - - emake || die -} - -src_install() { - einstall || die - use gnome || rm -r ${D}/usr/share/gnome/ ${D}/usr/share/pixmaps/ -} - -pkg_postinst() { - einfo "" - einfo "If you want to open archived files, you have to emerge" - einfo "'app-arch/rar' and/or 'app-arch/lha'." - einfo "e.g.) # emerge app-arch/rar" - einfo "" -} diff --git a/media-gfx/gimageview/gimageview-0.2.26.ebuild b/media-gfx/gimageview/gimageview-0.2.26.ebuild deleted file mode 100644 index 0ce38dcc3b12..000000000000 --- a/media-gfx/gimageview/gimageview-0.2.26.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.26.ebuild,v 1.3 2005/01/18 11:23:31 usata Exp $ - -inherit eutils gcc - -DESCRIPTION="Powerful GTK+ based image & movie viewer" -HOMEPAGE="http://gtkmmviewer.sourceforge.net/" -SRC_URI="mirror://sourceforge/gtkmmviewer/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ppc ~amd64 ~ppc64" -# mng, xine, and mplayer are local flags -IUSE="gnome nls gtk gtk2 imlib wmf mng svg xine mplayer" - -DEPEND="virtual/x11 - media-libs/libpng - nls? ( sys-devel/gettext ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - mng? ( >=media-libs/libmng-1.0.3 ) - svg? ( >=gnome-base/librsvg-1.0.3 ) - xine? ( >=media-libs/xine-lib-0.9.13-r3 ) - mplayer? ( >=media-video/mplayer-0.92 ) - gtk? ( gtk2? ( =x11-libs/gtk+-2* ) - !gtk2? ( =x11-libs/gtk+-1.2* ) ) - !gtk? ( || ( - imlib? ( media-libs/imlib ) - media-libs/gdk-pixbuf - ) )" - -src_compile() { - local myconf="" - - if ! use gtk2 && use imlib; then - myconf="--disable-gdk-pixbuf" - else - myconf="--disable-imlib" - fi - - econf \ - $(use_enable nls) \ - $(use_with wmf libwmf) \ - $(use_with mng libmng) \ - $(use_with svg librsvg) \ - $(use_with xine) \ - $(use_enable mplayer) \ - $(use_with gtk2) \ - ${myconf} --enable-splash || die - - emake || die -} - -src_install() { - einstall || die - use gnome || rm -r ${D}/usr/share/gnome/ ${D}/usr/share/pixmaps/ -} - -pkg_postinst() { - einfo "" - einfo "If you want to open archived files, you have to emerge" - einfo "'app-arch/rar' and/or 'app-arch/lha'." - einfo "e.g.) # emerge app-arch/rar" - einfo "" -} diff --git a/media-gfx/gimageview/gimageview-0.2.27-r1.ebuild b/media-gfx/gimageview/gimageview-0.2.27-r1.ebuild index 28e1ae7ec86b..2451dab8fb05 100644 --- a/media-gfx/gimageview/gimageview-0.2.27-r1.ebuild +++ b/media-gfx/gimageview/gimageview-0.2.27-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.27-r1.ebuild,v 1.6 2005/04/08 19:59:39 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimageview/gimageview-0.2.27-r1.ebuild,v 1.7 2005/05/29 02:31:07 usata Exp $ inherit eutils @@ -14,6 +14,7 @@ KEYWORDS="x86 ppc amd64 ppc64" # mng, xine, and mplayer are local flags IUSE="gnome nls gtk gtk2 imlib wmf mng svg xine mplayer" +# gtk USE flag is correct; it's there only because of gtk2 USE flag semantics DEPEND="virtual/x11 media-libs/libpng nls? ( sys-devel/gettext ) @@ -24,10 +25,8 @@ DEPEND="virtual/x11 mplayer? ( >=media-video/mplayer-0.92 ) gtk? ( gtk2? ( =x11-libs/gtk+-2* ) !gtk2? ( =x11-libs/gtk+-1.2* ) ) - !gtk? ( || ( - imlib? ( media-libs/imlib ) - media-libs/gdk-pixbuf - ) )" + !gtk? ( =x11-libs/gtk+-1.2* + imlib? ( media-libs/imlib ) )" src_unpack() { unpack ${A} @@ -39,10 +38,10 @@ src_unpack() { src_compile() { local myconf="" - if ! use gtk2 && use imlib; then + if use gtk && use gtk2 ; then + myconf="--with-gtk2" + elif ! use gtk && use imlib; then myconf="--disable-gdk-pixbuf" - else - myconf="--disable-imlib" fi econf \ @@ -52,7 +51,6 @@ src_compile() { $(use_with svg librsvg) \ $(use_with xine) \ $(use_enable mplayer) \ - $(use_with gtk2) \ ${myconf} --enable-splash || die emake || die |