summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2008-03-18 19:57:26 +0000
committerRaúl Porcel <armin76@gentoo.org>2008-03-18 19:57:26 +0000
commit70460d6b57cfddeb321c876ce91bcd5edb82ef7b (patch)
tree91786add17f4bb37edcffce0d2501e5e0a255c11 /dev-util/xxdiff
parentamd64 stable (diff)
downloadhistorical-70460d6b57cfddeb321c876ce91bcd5edb82ef7b.tar.gz
historical-70460d6b57cfddeb321c876ce91bcd5edb82ef7b.tar.bz2
historical-70460d6b57cfddeb321c876ce91bcd5edb82ef7b.zip
sparc stable, fix kde deps, bug #213428
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'dev-util/xxdiff')
-rw-r--r--dev-util/xxdiff/ChangeLog6
-rw-r--r--dev-util/xxdiff/Manifest7
-rw-r--r--dev-util/xxdiff/xxdiff-3.0.2-r1.ebuild63
-rw-r--r--dev-util/xxdiff/xxdiff-3.2-r1.ebuild8
-rw-r--r--dev-util/xxdiff/xxdiff-3.2.ebuild59
5 files changed, 12 insertions, 131 deletions
diff --git a/dev-util/xxdiff/ChangeLog b/dev-util/xxdiff/ChangeLog
index 4f3d3829ba80..5d6a57022850 100644
--- a/dev-util/xxdiff/ChangeLog
+++ b/dev-util/xxdiff/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-util/xxdiff
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.44 2008/03/18 19:52:26 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/ChangeLog,v 1.45 2008/03/18 19:57:26 armin76 Exp $
+
+ 18 Mar 2008; Raúl Porcel <armin76@gentoo.org> -xxdiff-3.0.2-r1.ebuild,
+ -xxdiff-3.2.ebuild, xxdiff-3.2-r1.ebuild:
+ sparc stable, fix kde deps, bug #213428
18 Mar 2008; Santiago M. Mola <coldwind@gentoo.org> xxdiff-3.2-r1.ebuild:
amd64 stable
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index 6d2c32c7f6fa..70cfc88b829e 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1,9 +1,6 @@
AUX kdesupport.patch 588 RMD160 e074c1e222915db5a73db9bd183133bb3abed78e SHA1 600cb81828f908791de77a2821a1af0f9f388b99 SHA256 c64273cf6b4368547f5539fa12eb6c40077d625a2a3342b925437ad0c636cbb2
AUX xxdiff-3.2-kdesupport.patch 492 RMD160 ebaa92902e28f5370b29f1d964e87783b7d28f52 SHA1 3a6a112a6f2bcd203e41ac41dadd2bb852db1258 SHA256 36e8276f74941a71a72ab2b73c542ce57e5a33211731029e2f39ed8605b89a50
-DIST xxdiff-3.0.2.tar.gz 1064508 RMD160 5f6eb4db32bab0816a60683cc5edd9481de297f2 SHA1 352f5738735bf1e3f5e0aaca7fc380bfac36af43 SHA256 e28fd625cdbb341110d47a949cbe035ca594d6fa716a072f6b608b9474a769fc
DIST xxdiff-3.2.tar.bz2 1341967 RMD160 12e7527f39713b925f05b687c2ad8b60459bb670 SHA1 ab2848fd9279f55b5db270f319ad4791154ecf82 SHA256 965534bab462aea8aacb6c35c0683c1079f06d055ff13820584ac862134db2b8
-EBUILD xxdiff-3.0.2-r1.ebuild 1547 RMD160 4a05591cb23f8fe2c68831303226db9c42b29be7 SHA1 8100dee5a4ca3a3132d4bfa67f9433706b21276c SHA256 9e1316b8d4dcf7a79dc4063b4b555a7e86482d0ee6101eef7614ca8fb48d9102
-EBUILD xxdiff-3.2-r1.ebuild 1981 RMD160 ff1754e04bdd5ddf1079b4c55296a039efaaf74d SHA1 675ab217bfdefd64abbf613a44d4c2599683fb83 SHA256 cdf1a44228a9a1318b152e1e25d09b05ac6baee9bc49d0f02a2ae9c41477fe0d
-EBUILD xxdiff-3.2.ebuild 1358 RMD160 321f71e92e35ff2bde486b55652f8ca482467f20 SHA1 1bc26a0298540de39876fd79d5204aeb323826ea SHA256 e024d783160cd9f1ac10d9a2f87d33b998a1a404cff5a095ae2151ae79b28180
-MISC ChangeLog 5959 RMD160 369518712351b1b2c8a932251acf52838e13afc3 SHA1 89028a7c1615da1b4534785b3a78638550ad07eb SHA256 33baeca6149c30bf5b5886834a0be3d833a2fe5f8ee33152245b5bc737f6c76b
+EBUILD xxdiff-3.2-r1.ebuild 1987 RMD160 5c5c3737d34e21e6c38532e28c30c39b0b5a3f8c SHA1 329978d9df1ebdc14afdde82e3fb4cafe9986a0d SHA256 243c2af28a018c37703ffbf4291add10c3fd8cf83e039b84318c75cc69c8dda3
+MISC ChangeLog 6119 RMD160 723b0f79fe9c59f71b24fe8a696998bccbb33dab SHA1 e8c256df1081439259b8e3b0deeb64b0be2061d6 SHA256 678257f969066585af62ca4c1f2abe9a69ef18c58a214d4cd554772184589d3b
MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
diff --git a/dev-util/xxdiff/xxdiff-3.0.2-r1.ebuild b/dev-util/xxdiff/xxdiff-3.0.2-r1.ebuild
deleted file mode 100644
index 0c3cddb4d7a7..000000000000
--- a/dev-util/xxdiff/xxdiff-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-3.0.2-r1.ebuild,v 1.7 2005/10/11 09:39:50 greg_g Exp $
-
-inherit eutils kde-functions
-
-DESCRIPTION="A graphical file and directories comparator and merge tool."
-HOMEPAGE="http://xxdiff.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="alpha ~amd64 ia64 ~ppc sparc x86"
-IUSE="kde"
-
-DEPEND="=x11-libs/qt-3*
- kde? ( >=kde-base/kdelibs-3.1 )"
-
-RDEPEND="${DEPEND}
- sys-apps/diffutils"
-
-DEPEND="${DEPEND}
- =dev-util/tmake-1.8*"
-
-set-kdedir 3
-
-src_unpack()
-{
- unpack ${A}
-
- if use kde; then
- cd ${S}/src
- cp ${FILESDIR}/kdesupport.patch ${T}/
- sed -i -e "s:/usr/kde/3.1:${KDEDIR}:g" ${T}/kdesupport.patch
- epatch ${T}/kdesupport.patch
- fi
-}
-
-src_compile() {
- cd src
- tmake -o Makefile xxdiff.pro
-
- ### borrowed from kde.eclass #
- #
- # fix the sandbox errors "can't writ to .kde or .qt" problems.
- # this is a fake homedir that is writeable under the sandbox, so that the build
- # process can do anything it wants with it.
- REALHOME="${HOME}"
- mkdir -p ${T}/fakehome/.kde
- mkdir -p ${T}/fakehome/.qt
- export HOME="${T}/fakehome"
-
- # things that should access the real homedir
- [ -d "${REALHOME}/.ccache" ] && ln -sf "${REALHOME}/.ccache" "${HOME}/"
-
- emake || die
-}
-
-src_install () {
- dobin bin/xxdiff bin/xxdiff-cvs-diff bin/xxdiff-encrypted bin/xxdiff-find-grep-sed bin/xxdiff-match
- doman src/xxdiff.1
- dodoc README CHANGES TODO
-}
diff --git a/dev-util/xxdiff/xxdiff-3.2-r1.ebuild b/dev-util/xxdiff/xxdiff-3.2-r1.ebuild
index 23d5a6f981e1..8529fad20d7f 100644
--- a/dev-util/xxdiff/xxdiff-3.2-r1.ebuild
+++ b/dev-util/xxdiff/xxdiff-3.2-r1.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-3.2-r1.ebuild,v 1.4 2008/03/18 19:52:26 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-3.2-r1.ebuild,v 1.5 2008/03/18 19:57:26 armin76 Exp $
+
+EAPI="1"
inherit distutils eutils kde-functions toolchain-funcs
@@ -10,11 +12,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
IUSE="kde python debug"
RDEPEND="=x11-libs/qt-3*
- kde? ( >=kde-base/kdelibs-3.1 )"
+ kde? ( kde-base/kdelibs:3.5 )"
DEPEND="${RDEPEND}
sys-devel/flex
diff --git a/dev-util/xxdiff/xxdiff-3.2.ebuild b/dev-util/xxdiff/xxdiff-3.2.ebuild
deleted file mode 100644
index 5a820f6371a9..000000000000
--- a/dev-util/xxdiff/xxdiff-3.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/xxdiff/xxdiff-3.2.ebuild,v 1.8 2007/06/26 02:05:52 mr_bones_ Exp $
-
-inherit distutils eutils kde-functions
-
-DESCRIPTION="A graphical file and directories comparator and merge tool."
-HOMEPAGE="http://xxdiff.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
-IUSE="kde python"
-
-DEPEND="=x11-libs/qt-3*
- kde? ( >=kde-base/kdelibs-3.1 )
- sys-devel/flex
- || ( sys-devel/bison dev-util/yacc )"
-RDEPEND="${DEPEND}
- sys-apps/diffutils"
-
-set-kdedir 3
-
-src_unpack() {
- unpack ${A}
-
- if use kde; then
- cd "${S}/src"
- epatch "${FILESDIR}/${P}-kdesupport.patch"
- sed -i "s:/usr/include/kde:${KDEDIR}/include:g" xxdiff.pro
- sed -i "s:QMAKE_LIBS +=:QMAKE_LIBS+= -L${KDEDIR}/lib:g" xxdiff.pro
- fi
-}
-
-src_compile() {
- if use python; then
- distutils_src_compile
- fi
-
- cd src
- make -f Makefile.bootstrap makefile || die "Makefile creation failed"
- emake || die
- cd ../doc
- emake || die "Doc failed"
-
-}
-
-src_install () {
- if use python; then
- distutils_src_install
- fi
-
- dobin bin/xxdiff bin/xx-cvs-diff bin/xx-encrypted bin/xx-find-grep-sed bin/xx-match
- doman src/xxdiff.1
- dodoc README CHANGES TODO
- cd doc
- dodoc xxdiff-doc.html
-}