diff options
author | Alastair Tse <liquidx@gentoo.org> | 2003-10-15 10:06:31 +0000 |
---|---|---|
committer | Alastair Tse <liquidx@gentoo.org> | 2003-10-15 10:06:31 +0000 |
commit | 7e82907ea610fec091b51d1ae90ceadb877ed2eb (patch) | |
tree | 422b1a81ca66314d3757c87af3d4c80c0e591427 /dev-util | |
parent | version bump (diff) | |
download | gentoo-2-7e82907ea610fec091b51d1ae90ceadb877ed2eb.tar.gz gentoo-2-7e82907ea610fec091b51d1ae90ceadb877ed2eb.tar.bz2 gentoo-2-7e82907ea610fec091b51d1ae90ceadb877ed2eb.zip |
version bump
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/meld/ChangeLog | 8 | ||||
-rw-r--r-- | dev-util/meld/Manifest | 5 | ||||
-rw-r--r-- | dev-util/meld/files/digest-meld-0.9.0 | 1 | ||||
-rw-r--r-- | dev-util/meld/files/meld-0.9.0-gentoo.diff | 56 | ||||
-rw-r--r-- | dev-util/meld/meld-0.9.0.ebuild | 48 |
5 files changed, 115 insertions, 3 deletions
diff --git a/dev-util/meld/ChangeLog b/dev-util/meld/ChangeLog index 3f5648c9bfe4..aa08be56c852 100644 --- a/dev-util/meld/ChangeLog +++ b/dev-util/meld/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/meld # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.7 2003/09/17 17:53:47 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/ChangeLog,v 1.8 2003/10/15 10:06:14 liquidx Exp $ + +*meld-0.9.0 (15 Oct 2003) + + 15 Oct 2003; Alastair Tse <liquidx@gentoo.org> meld-0.9.0.ebuild, + files/meld-0.9.0-gentoo.diff: + version bump 17 Sep 2003; Aron Griffis <agriffis@gentoo.org> meld-0.8.5.ebuild: Add ~alpha diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest index 0107132c2f6d..ffca506cf76d 100644 --- a/dev-util/meld/Manifest +++ b/dev-util/meld/Manifest @@ -1,10 +1,11 @@ -MD5 e240c8ebb99c2401a99c7a677047b92e ChangeLog 1232 +MD5 c42dea11ff293ce92ec0537625f62714 ChangeLog 1374 MD5 0529fbd1af790404749eff4ba2e99ec3 meld-0.8.3.ebuild 953 MD5 50ea05c2aff0e05d8e2b9e84f0be74bd meld-0.8.5.ebuild 962 -MD5 9386064702380a942ed16e664bdf0b19 meld-0.9.0.ebuild 1085 +MD5 145dbcdca68efa604806453303cb35d0 meld-0.9.0.ebuild 1103 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 MD5 ac9685b844f3fc43fdaae83ef92f5a3c files/digest-meld-0.8.3 58 MD5 982119cc13218dccc27583fee2baefef files/digest-meld-0.8.5 59 MD5 9535ffb3344b955b67d3ba1bda584fe9 files/digest-meld-0.9.0 59 MD5 a82b214a1e2501e96a7afc74ce5d20c2 files/meld-0.8.3-gentoo.diff 2055 MD5 625ae6345226923ab97f411268a4258b files/meld-0.8.5-gentoo.diff 2017 +MD5 1058b470e388a7de762db6f847abea48 files/meld-0.9.0-gentoo.diff 1631 diff --git a/dev-util/meld/files/digest-meld-0.9.0 b/dev-util/meld/files/digest-meld-0.9.0 new file mode 100644 index 000000000000..e6312bc7ecd6 --- /dev/null +++ b/dev-util/meld/files/digest-meld-0.9.0 @@ -0,0 +1 @@ +MD5 ade97f490ff61f2a5b85a3cc6d885232 meld-0.9.0.tgz 116391 diff --git a/dev-util/meld/files/meld-0.9.0-gentoo.diff b/dev-util/meld/files/meld-0.9.0-gentoo.diff new file mode 100644 index 000000000000..58c58bc52d98 --- /dev/null +++ b/dev-util/meld/files/meld-0.9.0-gentoo.diff @@ -0,0 +1,56 @@ +--- meld ++++ meld +@@ -52,6 +52,12 @@ + print "Due to incompatible API changes some functions may not operate as expected." + + # ++# Add the library path to the system load path ++# ++import os ++sys.path = [os.curdir, '/usr/lib/meld'] + sys.path ++ ++# + # main + # + import meldapp +--- meld.desktop ++++ meld.desktop +@@ -6,6 +6,6 @@ + Comment=Compare and merge your files. + TryExec=meld + Exec=meld +-Path=./meld + Terminal=false + Categories=GNOME;Application;Development; ++Icon=/usr/share/meld/glade2/pixmaps/icon.png +--- meldapp.py ++++ meldapp.py +@@ -453,7 +453,7 @@ + gnome.url_show("http://meld.sourceforge.net") + + def on_menu_users_manual_activate(self, button): +- gnome.url_show("file:///"+os.path.abspath(misc.appdir("manual/index.html") ) ) ++ gnome.url_show("file:///usr/share/doc/meld-0.9.0/html/index.html") + + def on_menu_about_activate(self, *extra): + about = gtk.glade.XML(misc.appdir("glade2/meld-app.glade"),"about").get_widget("about") +--- misc.py 2003-08-31 23:27:14.172632240 +0200 ++++ misc.py 2003-08-31 23:27:14.172632240 +0200 +@@ -55,14 +55,7 @@ + return ret + + def appdir(pathin): +- """Return where the application is installed. +- """ +- where = os.path.dirname(sys.argv[0]) +- pathout = os.path.join( where, pathin ) +- if not os.path.exists(pathout): +- run_dialog(_("Cannot find '%s'\nI looked in '%s'\n(%s)") % (pathin,where,pathout), None, gtk.MESSAGE_ERROR) +- sys.exit(1) +- return pathout ++ return os.path.join( "/usr/share/meld", pathin ) + + class struct: + """Similar to a dictionary except that members may be accessed as s.member. + + diff --git a/dev-util/meld/meld-0.9.0.ebuild b/dev-util/meld/meld-0.9.0.ebuild new file mode 100644 index 000000000000..a1bba7540c44 --- /dev/null +++ b/dev-util/meld/meld-0.9.0.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/meld/meld-0.9.0.ebuild,v 1.1 2003/10/15 10:06:14 liquidx Exp $ + +inherit python + +DESCRIPTION="A graphical (GNOME 2) diff and merge tool" +HOMEPAGE="http://meld.sourceforge.net/" +SRC_URI="mirror://sourceforge/meld/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~alpha" +IUSE="" + +DEPEND=">=dev-lang/python-2.2 + >=gnome-base/libglade-2 + >=gnome-base/libgnome-2 + >=dev-python/gnome-python-1.99.15 + >=dev-python/pygtk-1.99.15 + >=dev-python/pyorbit-1.99.0" + +src_unpack(){ + unpack ${A} + EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${PN}-0.9.0-gentoo.diff +} + +src_install() { + insinto /usr/lib/meld + doins *.py + dobin meld + insinto /usr/share/meld/glade2 + doins glade2/* + insinto /usr/share/meld/glade2/pixmaps + doins glade2/pixmaps/* + insinto /usr/share/applications + doins meld.desktop + dodoc AUTHORS COPYING INSTALL TODO.txt + dohtml manual/* +} + +pkg_postinst() { + python_mod_optimize /usr/lib/meld +} + +pkg_postrm() { + python_mod_cleanup /usr/lib/meld +} |