From: "Ian Stakenvicius" <axs@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/axs:master commit in: /
Date: Thu, 19 Feb 2015 01:30:53 +0000 (UTC) [thread overview]
Message-ID: <1424309427.d3d39452b962d670994894068a1328e37864657c.axs@gentoo> (raw)
commit: d3d39452b962d670994894068a1328e37864657c
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 19 01:28:03 2015 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Feb 19 01:30:27 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=dev/axs.git;a=commit;h=d3d39452
Merge and commit that messed up history, attempting to fix
media-gfx/Slic3r/Manifest | 2 +-
media-gfx/Slic3r/Slic3r-9999.ebuild | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --cc media-gfx/Slic3r/Manifest
index 33f123f,33f123f..510aa2e
--- a/media-gfx/Slic3r/Manifest
+++ b/media-gfx/Slic3r/Manifest
@@@ -1,3 -1,3 +1,3 @@@
AUX Slic3r-adjust_var_path.patch 274 SHA256 e32798a894bfb112bf1e87f94e76a1170f34ae40456ca33c684c1bf26f719661 SHA512 83802247efb5c450fc4b9dfbe407b6ff09f25599852287e6cc2a6ddc3f1dd04648ea8194cbd60dbed882dba5cd4a56a3b15992052659a7ec13a80f44c9d151cc WHIRLPOOL 2c3fca71c01ba9817d24e8f062cba40a40c3d5d6f7d88eddb1d4934cdba9e9716a07a5c9e421d44d637d186a363ac072f570a022a0d32017565bfb861a638172
--EBUILD Slic3r-9999.ebuild 2666 SHA256 4eacda1767a71af629586be38a61d19076786babbbd98cbd907e90bbb4cb4026 SHA512 2b58236402ff987d17849d3bbc07f25adfe504307ca98a8b08dd7c192adec1db0013d43ca78f332daa23c99a599c9f1751d458c9085121e306a4840fcfe89cac WHIRLPOOL 6ee8119f09387e0b2afddaa35a25dc1e34508964832420e6319985f749987d5c30cc2e719a9e45c3fb7a96269597f211338b86370b90c03bf912837884e96e73
++EBUILD Slic3r-9999.ebuild 2689 SHA256 90259bd1f7d6798edf9ee1b7e00c7a1e311458aa1bbf4aac6baf929027b1af84 SHA512 18d7960264ecb8a3a5d3ce5bef6bc33253cbcbb3f6d18eab2f8b4709cfa3ea2a99797bef870ac5c85e2d99727808e9af38682c2d972eac9e283120dca5ef88a2 WHIRLPOOL c5f1a8adb22ce97eca197d4657bc6b4b6fdabb74f018d8d9130ae30421bacef14cd2c33c1ad8e617d295a8612224b4cb1671c704e4039bc369575af86456120b
MISC metadata.xml 463 SHA256 6d846e1c203722bb73cc94a492dbe31095833214e18a5006d8d9daf766696340 SHA512 19fb5697ea8c7f97b1e0cdb8db86add03c345af27b3cf5aa69afcda5bbb6cb6237e6c0ff4827e50aee8b7209ea615ddc5258dda333a2f8a6eca1ac87445c4561 WHIRLPOOL fa3568d05ddb9d6dc7fc41cb8e8ea028759a99ef8a2882aea63d479c58d00536a3150989c4c268678dd6e9119588fcee700f1a5e2c1babde446954f9c149bf41
diff --cc media-gfx/Slic3r/Slic3r-9999.ebuild
index 24fb03a,24fb03a..438b19e
--- a/media-gfx/Slic3r/Slic3r-9999.ebuild
+++ b/media-gfx/Slic3r/Slic3r-9999.ebuild
@@@ -38,6 -38,6 +38,7 @@@ RDEPEND=
)
!minimal? (
dev-perl/libwww-perl
++ dev-perl/Net-Bonjour
dev-perl/XML-SAX
dev-perl/XML-SAX-Base
gui? (
next reply other threads:[~2015-02-19 1:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-19 1:30 Ian Stakenvicius [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-06-27 20:09 [gentoo-commits] dev/axs:master commit in: / Ian Stakenvicius
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1424309427.d3d39452b962d670994894068a1328e37864657c.axs@gentoo \
--to=axs@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox