diff options
| -rw-r--r-- | media-gfx/xli/Manifest | 4 | ||||
| -rw-r--r-- | media-gfx/xli/xli-1.17.0-r2.ebuild | 14 | ||||
| -rw-r--r-- | media-gfx/xli/xli-1.17.0-r3.ebuild | 48 |
3 files changed, 24 insertions, 42 deletions
diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest index a7a03a793253..5f6e74f13397 100644 --- a/media-gfx/xli/Manifest +++ b/media-gfx/xli/Manifest @@ -1,7 +1,7 @@ AUX Xli.ad 123 RMD160 c4770e6a5d941e42956eb934bf3774efcb546cc8 SHA1 312c18bbd45bdec7ec1d95f95aaa1120fe6d2599 SHA256 a26e3c36c81d124a08d143e9ebfabfbd2507ffb9e48f077ea3e837eacd3f3bd9 AUX xli-security-gentoo.diff 6940 RMD160 fbc25a1d43cba52ba1fe5444d2b74891a0927271 SHA1 d87139cb2f84574ec7722a2513b7ef9a7a530447 SHA256 d2d427f4eb0659786e18fb70aebb312e980e638a0034a24073e21c2e7b58e90a DIST xli-2005-02-27.tar.gz 201011 RMD160 fc83fa5173befa73a0eeb56ad323dad148ef1426 SHA1 977d8ece0edd41f3ec606310496cf3231f046d88 SHA256 442dcf5ac75841e648c3bffed795d9301a6a485dc55f7998d0acfc2b8daad2bc -EBUILD xli-1.17.0-r2.ebuild 2225 RMD160 0371b6f8539925d604cc7baf8012b6ff0a86cf0b SHA1 e90564b8d04994dc2c31f08dec65e4c415ab2584 SHA256 508231df7aed265e9af5365926cbcb782cd5248a04ff366a20543696bf347f56 -EBUILD xli-1.17.0-r3.ebuild 2238 RMD160 1cf4fb490bcbf28ea071917e3b8bbc783fb68e6d SHA1 eb532ebed87bf6ea0bdfe1c31519a1887da6817b SHA256 aef2bb97b97d41f64d5c43243a0762af276bc555a26d6e7480bf2c9bd152ca4c +EBUILD xli-1.17.0-r2.ebuild 2210 RMD160 5a2bed7541969784c37bb5a548aa4f766ba8f9df SHA1 7df7383992bba4789562f3b874cdc6868523a394 SHA256 a9178007776245856c16379bba233acf75988003dbe8a886b0d0a23beb427359 +EBUILD xli-1.17.0-r3.ebuild 1800 RMD160 094b87a9e62510e71cd5c45eb0230bd61561208f SHA1 334a02516258542460b35e8f918404489f429049 SHA256 239a1d908397d8bc88e1344892d2cfaebc6f5e9664794c2a13f9f1e6fe2b07b6 MISC ChangeLog 4693 RMD160 989e4ece3bb13f4912668008329e3718333114ab SHA1 45f6a799709f6c14a04929c022158f31b8cfc146 SHA256 5af5016b79e0aef1d8e6d2d7f1a8b33ec2464a1a87f47770bd55e06dd8cdb4e8 MISC metadata.xml 163 RMD160 9cdda004bed83a887f4a756cb1550fab6ce563ce SHA1 bfc4f31690e338a159152dcd46d56ff7fd6b6e1b SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564 diff --git a/media-gfx/xli/xli-1.17.0-r2.ebuild b/media-gfx/xli/xli-1.17.0-r2.ebuild index 990392df9f23..95465501e3b8 100644 --- a/media-gfx/xli/xli-1.17.0-r2.ebuild +++ b/media-gfx/xli/xli-1.17.0-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/xli-1.17.0-r2.ebuild,v 1.15 2008/01/15 18:33:24 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/xli-1.17.0-r2.ebuild,v 1.16 2009/09/04 12:21:48 ssuominen Exp $ inherit alternatives eutils @@ -17,7 +17,7 @@ IUSE="" RDEPEND="x11-libs/libXext >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.0.5 - >=media-libs/jpeg-6b-r2 + =media-libs/jpeg-6b* app-arch/bzip2" DEPEND="${RDEPEND} x11-proto/xextproto @@ -28,8 +28,7 @@ S=${WORKDIR}/${PN}-${SNAPSHOT} src_unpack() { unpack ${A} - - cd ${S} + cd "${S}" sed -i Imakefile \ -e "/^DEFINES =/s/$/ -DHAVE_GUNZIP -DHAVE_BUNZIP2 /" \ @@ -49,8 +48,7 @@ src_unpack() { } src_compile() { - xmkmf || die "xmkmf failed." - + xmkmf || die emake CDEBUGFLAGS="${CFLAGS}" || die } @@ -65,7 +63,7 @@ src_install() { #dosym /usr/bin/xli /usr/bin/xsetbg insinto /etc/X11/app-defaults - newins ${FILESDIR}/Xli.ad Xli || die + newins "${FILESDIR}"/Xli.ad Xli || die fperms a+r /etc/X11/app-defaults/Xli } diff --git a/media-gfx/xli/xli-1.17.0-r3.ebuild b/media-gfx/xli/xli-1.17.0-r3.ebuild index 859f4bcf00d1..5810327ac6fc 100644 --- a/media-gfx/xli/xli-1.17.0-r3.ebuild +++ b/media-gfx/xli/xli-1.17.0-r3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/xli-1.17.0-r3.ebuild,v 1.3 2008/01/15 18:33:24 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/xli/xli-1.17.0-r3.ebuild,v 1.4 2009/09/04 12:21:48 ssuominen Exp $ -inherit alternatives eutils +inherit eutils SNAPSHOT="2005-02-27" DESCRIPTION="X Load Image: view images or load them to root window" @@ -17,14 +17,16 @@ IUSE="" RDEPEND="x11-libs/libXext >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.0.5 - >=media-libs/jpeg-6b-r2 + =media-libs/jpeg-6b* app-arch/bzip2" DEPEND="${RDEPEND} x11-proto/xextproto x11-misc/imake - app-text/rman" + app-text/rman + !media-gfx/xloadimage + !<media-gfx/xli-1.17.0-r3" -S="${WORKDIR}"/${PN}-${SNAPSHOT} +S=${WORKDIR}/${PN}-${SNAPSHOT} src_unpack() { unpack ${A} @@ -48,40 +50,22 @@ src_unpack() { } src_compile() { - xmkmf || die "xmkmf failed." - - emake CDEBUGFLAGS="${CFLAGS}" || die "emake failed." + xmkmf || die + emake CDEBUGFLAGS="${CFLAGS}" || die } src_install() { - dobin xli xlito + dobin xli xlito || die + + dosym xli /usr/bin/xsetbg || die + dosym xli /usr/bin/xview || die + dodoc README README.xloadimage ABOUTGAMMA TODO chkgamma.jpg newman xli.man xli.1 newman xliguide.man xliguide.1 newman xlito.man xlito.1 insinto /etc/X11/app-defaults - newins ${FILESDIR}/Xli.ad Xli + newins "${FILESDIR}"/Xli.ad Xli fperms a+r /etc/X11/app-defaults/Xli } - -update_alternatives() { - local mansuffix=$(ecompress --suffix) - - alternatives_makesym /usr/bin/xview \ - /usr/bin/{xloadimage,xli} - alternatives_makesym /usr/bin/xsetbg \ - /usr/bin/{xloadimage,xli} - alternatives_makesym /usr/share/man/man1/xview.1${mansuffix} \ - /usr/share/man/man1/{xloadimage,xli}.1${mansuffix} - alternatives_makesym /usr/share/man/man1/xsetbg.1${mansuffix} \ - /usr/share/man/man1/{xloadimage,xli}.1${mansuffix} -} - -pkg_postinst() { - update_alternatives -} - -pkg_postrm() { - update_alternatives -} |