diff options
author | 2011-05-17 11:57:11 +0000 | |
---|---|---|
committer | 2011-05-17 11:57:11 +0000 | |
commit | 4836b6e4484cb37b5d2dcc208320452e13f2d612 (patch) | |
tree | 87afdd5cb535ad9552cb23021441546c59525010 | |
parent | Make it work with newer eclass (diff) | |
download | pauldv-4836b6e4484cb37b5d2dcc208320452e13f2d612.tar.gz pauldv-4836b6e4484cb37b5d2dcc208320452e13f2d612.tar.bz2 pauldv-4836b6e4484cb37b5d2dcc208320452e13f2d612.zip |
Create dropbox ebuild that does not depend on nautilus, so it works more natural in kde (if nautilus is installed, the binary will still try to use that)
svn path=/trunk/overlay/; revision=134
-rw-r--r-- | app-arch/dropbox/Manifest | 4 | ||||
-rw-r--r-- | app-arch/dropbox/NOTES.txt | 1 | ||||
-rw-r--r-- | app-arch/dropbox/dropbox-0.6.7.ebuild | 61 | ||||
-rw-r--r-- | app-arch/dropbox/files/remove-nautilus.patch | 89 | ||||
-rw-r--r-- | net-print/brother-colorlaser2/Manifest | 2 | ||||
-rw-r--r-- | net-print/brother-colorlaser2/brother-colorlaser2-1.0.3.ebuild | 6 | ||||
-rw-r--r-- | net-print/hl4040cnlpr/Manifest | 2 | ||||
-rw-r--r-- | net-print/hl4040cnlpr/hl4040cnlpr-1.0.3.ebuild | 5 |
8 files changed, 163 insertions, 7 deletions
diff --git a/app-arch/dropbox/Manifest b/app-arch/dropbox/Manifest new file mode 100644 index 0000000..6f79ec9 --- /dev/null +++ b/app-arch/dropbox/Manifest @@ -0,0 +1,4 @@ +AUX remove-nautilus.patch 3247 RMD160 a60c48a848d3f6cdf39fd51166573b19c82f9bb0 SHA1 97da301638bd986bffbd6e3f42f4b9fc59ee51cd SHA256 c78aa90cdd21610119e6cd431cce6b49b1b3c8dc6b82f37245a76bcefb75cdbc +DIST nautilus-dropbox-0.6.7.tar.bz2 324049 RMD160 a8e3601e47a429e3a5331468b1bfa0c1f87e790e SHA1 77ce777bd342eaf7ada3e3a4f6664f66ca4189fb SHA256 4f37ac309a674bccc7edcd37d62bdccec590e78e6db8224dda4e641d5022b554 +EBUILD dropbox-0.6.7.ebuild 1355 RMD160 1bb15564c5f126e5d738c5d099799aaab0c9e9d1 SHA1 a05a7d2cb6407260d2de4053b3664924e822ac5d SHA256 98f4256530ba49bb1692c21a6f1a7e590e571f31f9b48acfbccf549e962f4bed +MISC NOTES.txt 35 RMD160 9fd375012df2b5eb3bedb184070166139e4e89f9 SHA1 00ed5847604fc2d4384a3a0642f819ef151cff2e SHA256 73d2ed9f5285b5e4d30b70051bed8fa30f728761fb8443e6e7fa85c3f7c96a38 diff --git a/app-arch/dropbox/NOTES.txt b/app-arch/dropbox/NOTES.txt new file mode 100644 index 0000000..22dbf03 --- /dev/null +++ b/app-arch/dropbox/NOTES.txt @@ -0,0 +1 @@ +Version that does not use nautilus diff --git a/app-arch/dropbox/dropbox-0.6.7.ebuild b/app-arch/dropbox/dropbox-0.6.7.ebuild new file mode 100644 index 0000000..0137ce0 --- /dev/null +++ b/app-arch/dropbox/dropbox-0.6.7.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-dropbox/nautilus-dropbox-0.6.7-r1.ebuild,v 1.1 2011/05/11 15:34:32 hwoarang Exp $ + +EAPI="3" +PYTHON_DEPEND="2" +inherit autotools eutils python linux-info gnome2 + +MY_P=nautilus-${P} +DESCRIPTION="Store, Sync and Share Files Online - Without nautilus plugin" +HOMEPAGE="http://www.dropbox.com/" +SRC_URI="http://www.dropbox.com/download?dl=packages/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~x86-linux" +IUSE="debug" + +RDEPEND="dev-libs/glib:2 + dev-python/pygtk:2 + !gnome-extra/nautilus-dropbox + x11-libs/gtk+:2 + x11-libs/libnotify + x11-libs/libXinerama" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + dev-python/docutils" + +DOCS="AUTHORS ChangeLog NEWS README" +G2CONF="${G2CONF} $(use_enable debug) --disable-static" + +CONFIG_CHECK="INOTIFY_USER" + +S="${WORKDIR}/nautilus-${P}" + +pkg_setup () { + check_extra_config + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + gnome2_src_prepare + python_convert_shebangs 2 dropbox.in + + # Use system rst2man.py. + sed -e "s/python rst2man.py/rst2man.py/" -i Makefile.am || die "sed failed" + + epatch "${FILESDIR}/remove-nautilus.patch" + + eautoreconf +} + +src_install () { + gnome2_src_install +} + +pkg_postinst () { + gnome2_pkg_postinst +} diff --git a/app-arch/dropbox/files/remove-nautilus.patch b/app-arch/dropbox/files/remove-nautilus.patch new file mode 100644 index 0000000..50efd45 --- /dev/null +++ b/app-arch/dropbox/files/remove-nautilus.patch @@ -0,0 +1,89 @@ +diff -urN work.orig//nautilus-dropbox-0.6.7/configure.in work/nautilus-dropbox-0.6.7/configure.in +--- work.orig//nautilus-dropbox-0.6.7/configure.in 2010-11-04 20:30:20.000000000 +0000 ++++ work/nautilus-dropbox-0.6.7/configure.in 2011-05-17 12:39:01.000000000 +0100 +@@ -12,7 +12,6 @@ + #AC_PROG_INTLTOOL([0.29]) + + # Dependency checks +-NAUTILUS_REQUIRED=2.16.0 + GLIB_REQUIRED=2.14.0 + + # Used programs +@@ -26,7 +25,6 @@ + AC_MSG_ERROR(you need to have pkgconfig installed !) + fi + +-PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED) + PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED) + + AC_PATH_PROG([PYTHON], [python]) +@@ -57,8 +55,6 @@ + PYTHON_CHECK_MODULE(docutils, docutils) + + # Make dependency CFLAGS and LIBS available +-AC_SUBST(NAUTILUS_CFLAGS) +-AC_SUBST(NAUTILUS_LIBS) + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + +@@ -72,41 +68,11 @@ + esac],[debug=false]) + AM_CONDITIONAL([DEBUG], [test x$debug = xtrue]) + +-AC_ARG_WITH(nautilus-extension-dir, +- [AS_HELP_STRING([--with-nautilus-extension-dir], +- [specify the nautilus extension directory])]) +- +-# Get nautilus extensions directory +-AC_MSG_CHECKING([for nautilus extension directory]) +-if test -n "$with_nautilus_extension_dir"; then +- NAUTILUS_EXTENSION_DIR=$with_nautilus_extension_dir +-else +- NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension` +-fi +-if test -z "$NAUTILUS_EXTENSION_DIR"; then +- NAUTILUS_EXTENSION_DIR='${exec_prefix}/lib/nautilus/extension-1.0' +-fi +- +-AC_MSG_RESULT([${NAUTILUS_EXTENSION_DIR}]) +-AC_SUBST(NAUTILUS_EXTENSION_DIR) +- +-NAUTILUS_VERSION=`$PKG_CONFIG --modversion libnautilus-extension` +-if test -n "$NAUTILUS_VERSION"; then +- NAUTILUS_VERSION_MAJOR=`echo -n $NAUTILUS_VERSION | cut -d . -f 1` +- NAUTILUS_VERSION_MINOR=`echo -n $NAUTILUS_VERSION | cut -d . -f 2` +- NAUTILUS_VERSION_MICRO=`echo -n $NAUTILUS_VERSION | cut -d . -f 3` +-fi +- +-AC_DEFINE_UNQUOTED(NAUTILUS_VERSION_MAJOR, [$NAUTILUS_VERSION_MAJOR], [ nautilus version major]) +-AC_DEFINE_UNQUOTED(NAUTILUS_VERSION_MINOR, [$NAUTILUS_VERSION_MINOR], [ nautilus version minor]) +-AC_DEFINE_UNQUOTED(NAUTILUS_VERSION_MICRO, [$NAUTILUS_VERSION_MICRO], [ nautilus version micro]) +- + EMBLEM_DIR='${datadir}/nautilus-dropbox/emblems' + AC_SUBST(EMBLEM_DIR) + + AC_CONFIG_FILES([ + Makefile +- src/Makefile + data/Makefile + data/icons/Makefile + data/icons/hicolor/Makefile +diff -urN work.orig//nautilus-dropbox-0.6.7/Makefile.am work/nautilus-dropbox-0.6.7/Makefile.am +--- work.orig//nautilus-dropbox-0.6.7/Makefile.am 2011-05-17 12:36:31.000000000 +0100 ++++ work/nautilus-dropbox-0.6.7/Makefile.am 2011-05-17 12:40:28.000000000 +0100 +@@ -13,4 +13,4 @@ + python docgen.py $(PACKAGE_VERSION) < dropbox.txt.in > dropbox.txt + rst2man.py dropbox.txt > dropbox.1 + +-SUBDIRS = data src +\ No newline at end of file ++SUBDIRS = data +diff -urN work.orig//nautilus-dropbox-0.6.7/data/Makefile.am work/nautilus-dropbox-0.6.7/data/Makefile.am +--- work.orig//nautilus-dropbox-0.6.7/data/Makefile.am 2011-05-17 12:42:48.000000000 +0100 ++++ work/nautilus-dropbox-0.6.7/data/Makefile.am 2011-05-17 12:47:00.000000000 +0100 +@@ -3,4 +3,4 @@ + + EXTRA_DIST = $(application_DATA) + +-SUBDIRS = icons emblems ++SUBDIRS = icons diff --git a/net-print/brother-colorlaser2/Manifest b/net-print/brother-colorlaser2/Manifest index 694ca59..e2fbf94 100644 --- a/net-print/brother-colorlaser2/Manifest +++ b/net-print/brother-colorlaser2/Manifest @@ -1,2 +1,2 @@ DIST brother-colorlaser2-gpl-src-1.0.3-1.tar.gz 232787 RMD160 e827b234bc80f5903384cd3ce90cf2e16a3549c1 SHA1 cdc7969fa14316a0626e5007a71e1ac98bdbbced SHA256 cbfd5044fd26a797d344e816aeaf65a81457164683b6db743d5fcdb7e9d56580 -EBUILD brother-colorlaser2-1.0.3.ebuild 2844 RMD160 74db5e6aea405cc90200fe29abaf200a229b5485 SHA1 43317a55d83f6dba0aa45104b0af25d0d99188f6 SHA256 58dc66d824105487cb4805ee045538388ade17e3a37b46e768550a5da980676c +EBUILD brother-colorlaser2-1.0.3.ebuild 2848 RMD160 17d1ae28311722d6cace3617ed931123c4443d7c SHA1 3652ed81e1fc691886c20f4af61af6bacdc607d6 SHA256 28fc68690d3a286d4cda2643348aee28faae3aa3c527a32f30b96adeecdf8f48 diff --git a/net-print/brother-colorlaser2/brother-colorlaser2-1.0.3.ebuild b/net-print/brother-colorlaser2/brother-colorlaser2-1.0.3.ebuild index 9e163a8..2affb50 100644 --- a/net-print/brother-colorlaser2/brother-colorlaser2-1.0.3.ebuild +++ b/net-print/brother-colorlaser2/brother-colorlaser2-1.0.3.ebuild @@ -13,7 +13,7 @@ LICENSE="GPL-2" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="~x86 ~amd64" IUSE="" @@ -89,13 +89,13 @@ src_compile() { . $SETUP3 chmod a+x ${SETUP2} - + done } src_install() { dobin brcupsconfig2 || die "Install failed" - + for m in ${AVAILABLE_MODELS} do insinto /usr/share/cups/model/ diff --git a/net-print/hl4040cnlpr/Manifest b/net-print/hl4040cnlpr/Manifest index a11fb84..82ef13c 100644 --- a/net-print/hl4040cnlpr/Manifest +++ b/net-print/hl4040cnlpr/Manifest @@ -1,3 +1,3 @@ AUX useCupsFileType.patch 688 RMD160 ea9e73d85941da57e6661ddc1acbdf15c74c2785 SHA1 6508b47121da917538f40bd203d9c0b728e0b30e SHA256 4acd790706b51153a06d5c2f16d8c7cb898cd60095a583f22b437226e96fa9c0 DIST hl4040cnlpr-1.0.3-1.i386.rpm 341331 RMD160 9c42f3c6d8cbe517f4d7bf45452508a5b51f02e7 SHA1 e91e67e4b1691f2663c7513dc336d967a7f064ac SHA256 f39350eb1002e2c65e7302adaf627af99c644fd58b8a8daa70aaf28f9672d67a -EBUILD hl4040cnlpr-1.0.3.ebuild 2244 RMD160 0ea8613724ef70dcf98b01a7c9541d95f7983a79 SHA1 7ee7d4e00b547d671aed6e124aa9bbbba1f0e06f SHA256 0cf25112bf53e15a17b003a457d559856c68e06c46baaea3615bf341def849d6 +EBUILD hl4040cnlpr-1.0.3.ebuild 2305 RMD160 ea69eb8083284836c514827cca5bed591656e02e SHA1 eeab9cb0481b3c105fb40d56e932af15e0cfca29 SHA256 8dee12358ace89457c1d5553c7fe7bc4629fac3e7e831d003f4f85ea9994fd7c diff --git a/net-print/hl4040cnlpr/hl4040cnlpr-1.0.3.ebuild b/net-print/hl4040cnlpr/hl4040cnlpr-1.0.3.ebuild index dfdcb09..4b27104 100644 --- a/net-print/hl4040cnlpr/hl4040cnlpr-1.0.3.ebuild +++ b/net-print/hl4040cnlpr/hl4040cnlpr-1.0.3.ebuild @@ -15,7 +15,7 @@ LICENSE="as-is" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="~x86 ~amd64" IUSE="" @@ -29,7 +29,8 @@ IUSE="" # Run-time dependencies. Must be defined to whatever this depends on to run. # The below is valid if the same run-time depends are required to compile. -RDEPEND="net-print/cups +RDEPEND="amd64? ( app-emulation/emul-linux-x86-baselibs ) + net-print/cups >=sys-apps/file-5.06 app-text/ghostscript-gpl app-text/a2ps" |