Permalink
Browse files

glorious funtoo updates

merged:

  funtoo-overlay: 78a39bef72bb1e6647f4521bf84cfad1be6495ee
  foo-overlay: f7749549a67741868fbb3da8781e42cbac533fa7
  bar-overlay: f1e9085ee695ff5b6ce57d430d6b224aaf4fa0a6
  flora: 71480f728120d041d4fdf2c3cfd8497a4291fd2f
  mythtv: 232ca207c520eb294db060a770aafd30ffa25afb
  • Loading branch information...
1 parent 96c3018 commit e52ae44a3a08bdc09c9802d6a0d2b37350578a1e @danielrobbins danielrobbins committed Jan 3, 2013
Showing 445 changed files with 3,768 additions and 4,064 deletions.
@@ -0,0 +1,140 @@
+Patch extracted from maxima git repository.
+
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,19 @@
++2012-03-25 Yasuaki Honda <yasuaki.honda@gmail.com>
++ * version 1.03
++ * A new command "reinit-imaxima" is added. This command reset the
++ communication status of Emacs Lisp and Maxima. When imaxima does
++ not respond to any input, this command will help to resolve such
++ situation.
++
++2011-10-02 Yasuaki Honda <yasuaki.honda@gmail.com>
++ * version 1.01
++ * An old workaround code for tex prevented imaxima on Mac OS X
++ Lion from working. This is related to the placing of the temporary
++ file directory and the name of the file path containing the
++ character "_". This is fixed in this version.
++ * Special treatment of greek character gamma is removed from
++ imaxima.el and commited to maxima mactex.lisp.
++
+ 2009-02-07 Yasuaki Honda <yasuaki.honda@gmail.com>
+ * As for inline graph, if the emacs buffer window is too small for
+ the generated graph image, the graph is not displayed, but a file
+--- a/imaxima-autoconf-variables.el
++++ b/imaxima-autoconf-variables.el
+@@ -19,6 +19,6 @@
+ ;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ ;; MA 02111-1307 USA
+ (defconst *imaxima-autoconf-package* "imaxima-imath")
+-(defconst *imaxima-autoconf-version* "1.0")
++(defconst *imaxima-autoconf-version* "1.03")
+
+ (provide 'imaxima-autoconf-variables)
+--- a/imaxima.el
++++ b/imaxima.el
+@@ -420,6 +420,17 @@
+ (message "%s %s" *imaxima-autoconf-package* *imaxima-autoconf-version*))
+
+ ;;
++;; Reset
++;;
++
++(defun reinit-imaxima ()
++ "Re-initialize imaxima"
++ (interactive)
++ (setq imaxima-filter-running nil
++ imaxima-output nil
++ continuation nil))
++
++;;
+ ;; Geometry
+ ;;
+
+@@ -1174,6 +1185,7 @@
+ (switch-to-buffer imaxima-buffer)
+ (set-buffer imaxima-buffer))
+ (return-from imaxima t)))
++ (reinit-imaxima)
+ (unless (imaxima-image-type-available-p imaxima-image-type)
+ (error "Your version of Emacs does not support the image type %s"
+ imaxima-image-type))
+@@ -1183,9 +1195,7 @@
+ (setq imaxima-file-counter 0)
+ (make-directory
+ (setq imaxima-tmp-subdir
+- ;; For some reason TeX doesn't grok underscores in file names
+- (imaxima-subst-char-in-string ?_ ?=
+- (make-temp-name (expand-file-name "imaxima" imaxima-tmp-dir)))))
++ (make-temp-name (expand-file-name "imaxima" imaxima-tmp-dir))) t)
+ (set-file-modes imaxima-tmp-subdir 448) ; 700 in octal
+ (let ((process-connection-type process-connection-type-flag))
+ (if imaxima-use-maxima-mode-flag
+--- a/imaxima.lisp
++++ b/imaxima.lisp
+@@ -109,9 +109,9 @@
+ ;;; SBCL.
+ ;;; by yasuaki honda
+ #-sbcl
+-(if (not (fboundp (find-symbol "PRINT-INVERT-CASE" :maxima)))
+- (defun print-invert-case (obj)
+- (princ-to-string obj)))
++(unless (fboundp 'maxima::print-invert-case)
++ (defun print-invert-case (obj)
++ (princ-to-string obj)))
+
+ (defun print-case-sensitive (obj)
+ (if obj
+@@ -126,7 +126,7 @@
+
+ (defun main-prompt ()
+ (format () (concatenate 'string (string (code-char 3)) "(~A~D) " (string (code-char 4)))
+- (STRIPDOLLAR (print-case-sensitive $inchar)) $linenum))
++ (stripdollar (print-case-sensitive $inchar)) $linenum))
+
+ (defun break-dbm-loop (at)
+ (let* (
+@@ -142,7 +142,7 @@
+ (declare (special *mread-prompt* ))
+ (and (consp at) (set-env at))
+ (cond ((null at)
+- ($frame 0 nil)))
++ (break-frame 0 nil)))
+ (catch 'step-continue
+ (catch *quit-tag*
+ (unwind-protect
+@@ -672,9 +672,12 @@
+ (setq res (apply (symbol-function '$draw)
+ (append
+ `(
+- ((mequal simp) $terminal $eps)
+- ((mequal simp) $pic_width ,($first $wxplot_size))
+- ((mequal simp) $pic_height ,($second $wxplot_size))
++ ((mequal simp) $terminal $eps_color)
++ ((mequal simp) $dimensions
++ ((mlist simp)
++ ;; convert points to 1/100 of cm
++ ,(* 3.53 ($first $wxplot_size))
++ ,(* 3.53 ($second $wxplot_size))))
+ ((mequal simp) $file_name ,filename))
+ args)))
+ ($ldisp `((wxxmltag simp) ,(format nil "~a.eps" filename) "img"))
+--- a/imaxima.texi
++++ b/imaxima.texi
+@@ -223,6 +223,15 @@
+ information when you want to make bug reports.
+ @end defun
+
++@defun reinit-imaxima
++Initialize the imaxima program. Sometimes you may encounter situations
++where imaxima does not repond to your input. This is caused by the
++inconsistency between Emacs Lisp and Maxima. Such situations can be
++resolved by using this command. After calling this command from the
++Emacs mini buffer, you should type simple Maxima expression such as
++1+2; to ensure that the imaxima does respond to you now.
++@end defun
++
+ @node Inline Graph
+ @chapter Inline Graph
+
@@ -0,0 +1,26 @@
+Rename mlable to mlabel, accounting for corresponding change in maxima-5.29.
+https://bugs.gentoo.org/show_bug.cgi?id=448242
+
+Patch taken from maxima git repo:
+http://maxima.git.sourceforge.net/git/gitweb.cgi?p=maxima/maxima;a=commit;h=620f23e27328a58bfa81fe101734b7488a2b93f5
+
+--- a/imaxima.lisp
++++ b/imaxima.lisp
+@@ -498,7 +498,7 @@
+
+ (defun tex-mtext (x l r) (tex-list (cdr x) l r ""))
+
+-(defun tex-mlable (x l r)
++(defun tex-mlabel (x l r)
+ (tex (caddr x)
+ (append l
+ (if (cadr x)
+@@ -517,7 +517,7 @@
+ (defun latex (x)
+ ; (princ x) ;; uncomment to debug.
+ (if (and (listp x) (car x) (listp (car x)) (caar x)
+- (equal (caar x) 'mlable)
++ (equal (caar x) 'mlabel)
+ (cdr x)
+ (cadr x)
+ (input-label-p (cadr x)))
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/imaxima/imaxima-1.0-r2.ebuild,v 1.6 2011/06/19 16:31:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/imaxima/imaxima-1.0-r2.ebuild,v 1.7 2013/01/02 21:03:31 ulm Exp $
EAPI=3
@@ -11,7 +11,7 @@ DESCRIPTION="Imaxima enables graphical output in Maxima sessions with emacs"
HOMEPAGE="http://sites.google.com/site/imaximaimath/"
SRC_URI="http://members3.jcom.home.ne.jp/imaxima/Site/Download_and_Install_files/${MY_P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="examples"
@@ -20,7 +20,7 @@ DEPEND=""
RDEPEND="virtual/latex-base
app-text/ghostscript-gpl
dev-tex/mh
- sci-mathematics/maxima"
+ <sci-mathematics/maxima-5.29"
S="${WORKDIR}/${MY_P}"
SITEFILE="50${PN}-gentoo.el"
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/imaxima/imaxima-1.0-r3.ebuild,v 1.1 2013/01/02 21:03:31 ulm Exp $
+
+EAPI=5
+
+inherit elisp
+
+MY_P="${PN}-imath-${PV/_}"
+DESCRIPTION="Imaxima enables graphical output in Maxima sessions with emacs"
+HOMEPAGE="http://sites.google.com/site/imaximaimath/"
+SRC_URI="https://sites.google.com/site/imaximaimath/download-and-install/${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="examples"
+
+DEPEND=""
+RDEPEND="virtual/latex-base
+ app-text/ghostscript-gpl
+ dev-tex/mh
+ >=sci-mathematics/maxima-5.29"
+
+S="${WORKDIR}/${MY_P}"
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-1.03.patch
+ epatch "${FILESDIR}"/${P}-mlabel.patch
+ # Remove broken Info file (will be recreated)
+ rm imaxima.info
+}
+
+src_configure() {
+ econf --with-lispdir="${EPREFIX}${SITELISP}/${PN}"
+}
+
+src_compile() {
+ default
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+ dodoc ChangeLog NEWS README
+
+ if use examples; then
+ docinto imath-example
+ dodoc imath-example/*.txt
+ dohtml -r imath-example/.
+ fi
+}
@@ -1,3 +1,4 @@
DIST vagrant-1.0.3.gem 1005568 SHA256 bac078af86b5a64e1ea71be68827af051c62d0ec39a2784b2615051fe0d331d9 SHA512 3559942295a0f88d35dc69cc700e4b2da58589c78d1b943f4fde04e4b711752d2dc93740b4277197d0d7dd84eaa68d41f6f64a10407902eaeaad52ddc8f6b0e2 WHIRLPOOL 5b87b5f63b8329e2598d9aa00f1c27807e60a9ee873b803ba4687eebc23b33b1bce47183329a1e376caa2bf69d4f576b0413d25289b23ef2a1e4ed9d9b04b3f6
DIST vagrant-1.0.4.gem 1006080 SHA256 a826ecf187ef5f818bce907053152f678b77c636a4a950d341f6db05cc0e41d7 SHA512 f6df89718fd128400df78ab7ee15de3f292d4729a3ea22a97b979e9925d609739f9be41c6adc5cf84db88597b59da84285b3a1e925a9434b81cca22f6c6e9c7d WHIRLPOOL 63f0e8e2592f3f9f4793bf2d3be21c5d9b3ca72d73fac21d648d41ec5d562040f637c86c7622c4402c811562956a16e216ae2a7851374f6880d829c33749f5d0
DIST vagrant-1.0.5.gem 1007616 SHA256 7ff4ad6ff4b565c64663b57972e2eb42bf67d6ea95b8e5f34d5d0c5242fe3fc2 SHA512 cb3a5ea53108d00e8f4f7d0a3a395ec26f20b35786a9fe6fb7a507638b1038b10923c62aa03e6a7a9515a2562df3d6983429494b292c610246d3d4d43f23c3dc WHIRLPOOL d84a38f982ccdfc93ba1a541df13143442cb283af2fc7562d38a685e77158b77beea19ab6c806ba0105811fdc196dc4770abc990cab423d09e11d213cf7e5b73
+DIST vagrant-1.0.6.tar.gz 1005588 SHA256 e3ca4301bc8a1cf3cb0e55931a817d6e6432500ec0c9131095364ddda62bc82f SHA512 b6fcf583d204a3d145e6daa7445038a174b6541580235acf17a058b4ac2e1c71f924a35120a3de507417f72e0fa47d83f3a2d4c7affee3164fca2096defcad5d WHIRLPOOL 677c1081c4df4c21c695b2c03a0d8f4bfaf72f23094e94e128c48717f1bf23825774c85e1a6cfd92ac53e0e1fc90a19871e3cc73d7c911c36608aca68fce38ed
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vagrant/vagrant-1.0.6.ebuild,v 1.1 2013/01/03 06:09:15 radhermit Exp $
+
+EAPI="5"
+USE_RUBY="ruby18 ruby19"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
+RUBY_FAKEGEM_EXTRAINSTALL="config keys templates"
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A tool for building and distributing virtual machines using VirtualBox"
+HOMEPAGE="http://vagrantup.com/"
+SRC_URI="https://github.com/mitchellh/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="test"
+
+# Missing ebuild for contest
+RESTRICT="test"
+
+RDEPEND="${RDEPEND}
+ !x64-macos? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
+
+ruby_add_rdepend "
+ >=dev-ruby/archive-tar-minitar-0.5.2
+ >=dev-ruby/childprocess-0.3.1
+ >=dev-ruby/erubis-2.7.0
+ dev-ruby/i18n:0.6
+ >=dev-ruby/json-1.5.1
+ >=dev-ruby/log4r-1.1.9
+ >=dev-ruby/net-scp-1.0.4
+ >=dev-ruby/net-ssh-2.2.2
+"
+
+ruby_add_bdepend "
+ dev-ruby/rake
+ test? ( dev-ruby/mocha virtual/ruby-minitest )
+"
+
+all_ruby_prepare() {
+ # remove bundler support
+ sed -i '/[Bb]undler/d' Rakefile || die
+ rm Gemfile || die
+
+ # loosen unslotted dependencies
+ sed -e '/childprocess\|erubis\|json\|log4r\|net-scp\|net-ssh/s/~>/>=/' \
+ -e '/archive-tar-minitar/s/=/>=/' \
+ -i ${PN}.gemspec || die
+}
+
+pkg_postinst() {
+ if use x64-macos ; then
+ ewarn
+ ewarn "For Mac OS X prefixes, you must install the virtualbox"
+ ewarn "package specifically for OS X which can be found at:"
+ ewarn "https://www.virtualbox.org/wiki/Downloads"
+ ewarn
+ fi
+}
@@ -1 +1,2 @@
DIST laptop-mode-tools_1.60.tar.gz 104415 SHA256 39246db1bba2ea12c7ee6f1979f914a803a9f70836cde687ff9c3a39bc9c9519 SHA512 79596bb24b2af8bbeb3424eeff51022bb381609325a0eb5c009e0970dffe055d2493509d56a4e2c8f745c27f03bc176372d9b27e3a0a050f7bc1c58f86aae5c9 WHIRLPOOL 819cd4ad40c9e2a74bc07f70986c985b4128828ed508d808097472ee301ca788567b65d86717552a8191b378d595cb41b922a9e2f5a2fbcacf645acfe607d0ec
+DIST laptop-mode-tools_1.62.tar.gz 105941 SHA256 d40b3d2fb4dc120b4a427ef7dbddc9dd4d9ea0c475685538d36d3457b39158cd SHA512 3ba2a8db860349c5766f5282ca6f70f3bb780cb44e8674beb7e9c5783e96fc07a144245cc50414fef61b1cd6e08a2096667806792c2853cbcc9c83eb7d796b1a WHIRLPOOL 232115a3a6599241892abcc3f64db8bfa1c897bebbc22c198ce58bcb6bb3dd99aa3fb143c07f69fd6e6099b76da9c494423def0c86c8eeb3b610f9f3e51c0505
@@ -0,0 +1,28 @@
+--- usr/sbin/laptop_mode.orig 2013-01-02 22:07:03.879859499 +0100
++++ usr/sbin/laptop_mode 2013-01-02 22:08:31.740888273 +0100
+@@ -670,23 +670,14 @@
+ fi
+
+ if [ "$ENABLE_LAPTOP_MODE_WHEN_LID_CLOSED" -ne 0 -a "$ACTIVATE" -eq 0 ] ; then
+- if [ -x "`which hal-find-by-property`" ] ; then
+- HAL_LID_BUTTON=$(hal-find-by-property --key "button.type" --string "lid")
+- fi
+- if [ "$HAL_LID_BUTTON" != "" ] ; then
+- HAL_LID_BUTTON_STATE=$(hal-get-property --udi $(hal-find-by-property --key "button.type" --string "lid") --key "button.state.value")
+- if [ "$HAL_LID_BUTTON_STATE" = "true" ] ; then
+- log "VERBOSE" "Setting action to \"start\" because the lid is closed (says HAL)."
+- ACTIVATE=1
+- fi
+- elif [ -f /proc/acpi/button/lid/*/state ] ; then
++ if [ -f /proc/acpi/button/lid/*/state ] ; then
+ if ( grep -q "closed" /proc/acpi/button/lid/*/state ) ; then
+ log "VERBOSE" 'Setting action to "start" because the lid is closed (says /proc/acpi/button/lid/*/state).'
+ ACTIVATE=1
+ fi
+ else
+ log "MSG" "Warning: ENABLE_LAPTOP_MODE_WHEN_LID_CLOSED is set, but there is no file"
+- log "MSG" "/proc/acpi/button/lid/.../state, and hal information is not available either!"
++ log "MSG" "/proc/acpi/button/lid/.../state"
+ fi
+ fi
+
Oops, something went wrong.

0 comments on commit e52ae44

Please sign in to comment.