[solved] eix-sync / git pull - conflicts

[emc]

I have problem with sync, I did:

Code: Select all

gopher portage # git clean -df
gopher portage # git checkout -- .
gopher portage # git fetch
gopher portage # git pull 
... tons of changes ...
Automatic merge failed; fix conflicts and then commit the result.

So, git status shows ~3000 of new and modified files i.e.

Code: Select all

....        
        new file:   xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.ebuild
        modified:   xfce-extra/xfce4-gvfs-mount/Manifest
        modified:   xfce-extra/xfce4-linelight-plugin/Manifest
        modified:   xfce-extra/xfce4-modemlights-plugin/Manifest
        modified:   xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.3.ebuild
        modified:   xfce-extra/xfce4-volumed/Manifest

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

        deleted by us:   metadata/dtd/repositories.dtd
        both modified:   metadata/timestamp.chk

and eix-sync list same ~3000 of files with:

Code: Select all

............
A       xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.ebuild
M       xfce-extra/xfce4-gvfs-mount/Manifest
M       xfce-extra/xfce4-linelight-plugin/Manifest
M       xfce-extra/xfce4-modemlights-plugin/Manifest
M       xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.3.ebuild
M       xfce-extra/xfce4-volumed/Manifest
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution and make a commit.
!!! git pull error in /usr/portage

Performing Global Updates
(Could take a couple of minutes if you have a lot of binary packages.)
  .='update pass'  *='binary update'  #='/var/db update'  @='/var/db move'
  s='/var/db SLOT move'  %='binary move'  S='binary SLOT move'
  p='update /etc/portage/package.*'
/usr/portage/profiles/updates/3Q-2015...........................


q: Updating ebuild cache ... 
q: Finished 38224 entries in 1.758487 seconds
 * Main gentoo tree does not appear to have changed: exiting
 * Use -a or set have_changed=: in a ! hook to override this check
 * Time statistics:
    24 seconds for syncing
    25 seconds total

Code: Select all

gopher portage # cat /etc/portage/repos.conf/gentoo.conf 
[DEFAULT]
main-repo = gentoo

[gentoo]
#location = /usr/portage
#sync-type = rsync
#sync-uri = rsync://rsync6.pl.gentoo.org/gentoo-portage

location = /usr/portage
sync-type = git
sync-uri = https://github.com/gentoo-mirror/gentoo
auto-sync = yes
sync-depth =1

Code: Select all

gopher portage # git remote -v
origin  https://github.com/gentoo-mirror/gentoo (fetch)
origin  https://github.com/gentoo-mirror/gentoo (push)

Code: Select all

gopher portage # git config -l
user.name=les kes
user.email=xxxxxxx@mail.com
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
remote.origin.url=https://github.com/gentoo-mirror/gentoo
remote.origin.fetch=+refs/heads/master:refs/remotes/origin/master
branch.master.remote=origin
branch.master.merge=refs/heads/master
merge.renamelimit=3467

What I'm missing???

[emc]

bump

[ct85711]

Just wondering, but did you try to transition from rsync to git syncing? The key part of how git works is that it monitors all files it knows of; so trying to transition an existing tree from rsync to git fails, because git doesn't know of any of the existing tree before hand. Now, there is 3 ways (that I can think of) to fix this

The easiest way (not necessarily the best, but easiest and works every time) is remove the entire tree and resync. This allows git to remake the tree, and with nothing already there it won't have any conflicts (I'd recommend only removing the contents of /usr/portage and it's subdirectories while keeping the base portage directory still there.

The otherway, is from the /usr/portage as root run

Code: Select all

git add -A
git commit

These 2 commands adds all of the existing tree to portage's history stored localy on your computer (does not transfer outside of your computer, that is a different command).

The third way (probably the proper way to do it) is from the /usr/portage directory run

Code: Select all

git reset --hard

This will reset your local tree to the base tree (from the server), removing all files/changes that shouldn't be there.

**Note: I am still learning git, so there may be better ways that I don't know of yet.

[emc]

Just wondering, but did you try to transition from rsync to git syncing? The key part of how git works is that it monitors all files it knows of; so trying to transition an existing tree from rsync to git fails, because git doesn't know of any of the existing tree before hand. Now, there is 3 ways (that I can think of) to fix this

The easiest way (not necessarily the best, but easiest and works every time) is remove the entire tree and resync. This allows git to remake the tree, and with nothing already there it won't have any conflicts (I'd recommend only removing the contents of /usr/portage and it's subdirectories while keeping the base portage directory still there.

I did it first when I migrate form rsync -> git and then I got problems as you can see in my first post.

The otherway, is from the /usr/portage as root run

Code: Select all

git add -A
git commit

Did I miss somthing, IMHO opinon gentoo git tree supoose be readonly, why do i have to add and commit anything???

These 2 commands adds all of the existing tree to portage's history stored localy on your computer (does not transfer outside of your computer, that is a different command).

The third way (probably the proper way to do it) is from the /usr/portage directory run

Code: Select all

git reset --hard

This will reset your local tree to the base tree (from the server), removing all files/changes that shouldn't be there.

I did it as well before post to forum, still git complains about ~3000 files are add/remove/modified!

**Note: I am still learning git, so there may be better ways that I don't know of yet.

I use git since 2 years at work but I don't get it how after sucesfull clone of repo I got merge problems!?!??!

[emc]

Code: Select all

rm -rf /usr/portage

and

Code: Select all

eix-sync

Solve it!

[papu]

i had a git pull error and sync problems, doing git reset --hard fix all this

[steveL]

Code: Select all

rm -rf /usr/portage

and

Code: Select all

eix-sync

Solve it!

Bye bye distfiles.. ;-)

[emc]

Code: Select all

rm -rf /usr/portage

and

Code: Select all

eix-sync

Solve it!

Bye bye distfiles..

Nope

Code: Select all

~ $ emerge --info | grep DISTDIR
DISTDIR="/var/portage/distfiles"

[steveL]

lul; okay, you win ;) but it's worth pointing out for anyone else when you suggest that command.

People have a habit of copy-pasting, especially if it's in a code-block, ime.

[gerard27]

Funny place for distdir /var/portage/distdir.
Gerard.

[alinefr]

Is there any advantage of using github mirror over gentoo.org server for portage git sync? Avoiding overload in gentoo.org servers?

I could not find any docs regarding git for portage, except https://wiki.gentoo.org/wiki/Project:Portage/Sync

At the moment my portage/repos.conf/gentoo.conf looks like this:

Code: Select all

[DEFAULT] 
main-repo = gentoo 

[gentoo] 
auto-sync = yes 
location = /usr/portage 
sync-type = git
sync-uri = https://anongit.gentoo.org/git/repo/gentoo.git

[khayyam]

Funny place for distdir /var/portage/distdir.

gerard82 ... you mean, the default locations (and all the nonsense various tools use to find, and or create, repos ... ie, crossdev, layman, etc) makes any sense?

Code: Select all

# portageq get_repo_path / gentoo
/var/pkg/gentoo
# portageq get_repo_path / foo-overlay
/var/pkg/foo-overlay
# portageq get_repo_path / local
/var/pkg/local
# portageq distdir
/usr/src/distfiles

There should have been some thought given to a top level namespace from the outset, and the existing FSH should have been used for housing stuff like sources/distfiles.

Is there any advantage of using github mirror over gentoo.org server for portage git sync? Avoiding overload in gentoo.org servers?

No, in fact the use of github might be seen to violate the gentoo charter as gentoo must remain "independent", and so not depend on such services from commercial entities (is it me or has that section of the charter been substantially reduced?).

best ... khay

[Roman_Gruber]

Hi, I do not know where to ask so:

How can I tell how old my portage tree is now? In the old days with rsync there was a line wiht timestamp of tree ....

I was forced to change to git as i realized that my portage won't update anymore. Some weird error.
So I removed the portage tree by hand, and changed hte file below. It seems my box works now

Code: Select all

cat /etc/portage/repos.conf/gentoo.conf 
[DEFAULT] 
main-repo = gentoo 

[gentoo] 
location = /usr/portage 
sync-type = git 
sync-uri = https://github.com/gentoo/gentoo.git 
auto-sync = yes 

Code: Select all

emerge --info
Portage 2.2.26 (python 2.7.11-final-0, default/linux/amd64/13.0/desktop, gcc-5.3.0, glibc-2.22-r1, 4.3.2-gentoo_2015-12-13 x86_64)
=================================================================
System uname: Linux-4.3.2-gentoo_2015-12-13-x86_64-Intel-R-_Core-TM-_i7-3610QM_CPU_@_2.30GHz-with-gentoo-2.2
KiB Mem:    16399544 total,  12208040 free
KiB Swap:          0 total,         0 free
sh bash 4.3_p42
ld GNU ld (Gentoo 2.25.1 p1.1) 2.25.1
app-shells/bash:          4.3_p42::gentoo
dev-java/java-config:     2.2.0::gentoo
dev-lang/perl:            5.22.0::gentoo
dev-lang/python:          2.7.11::gentoo, 3.4.3-r5::gentoo
dev-util/cmake:           3.4.1::gentoo
dev-util/pkgconfig:       0.29::gentoo
sys-apps/baselayout:      2.2::gentoo
sys-apps/openrc:          0.19.1::gentoo
sys-apps/sandbox:         2.9::gentoo
sys-devel/autoconf:       2.13::gentoo, 2.69-r1::gentoo
sys-devel/automake:       1.10.3-r1::gentoo, 1.11.6-r1::gentoo, 1.12.6::gentoo, 1.13.4::gentoo, 1.14.1::gentoo, 1.15::gentoo
sys-devel/binutils:       2.25.1-r1::gentoo
sys-devel/gcc:            4.9.3::gentoo, 5.3.0::gentoo
sys-devel/gcc-config:     1.8::gentoo
sys-devel/libtool:        2.4.6-r1::gentoo
sys-devel/make:           4.1-r1::gentoo
sys-kernel/linux-headers: 4.3::gentoo (virtual/os-headers)
sys-libs/glibc:           2.22-r1::gentoo
Repositories:

gentoo
    location: /usr/portage
    sync-type: git
    sync-uri: https://github.com/gentoo/gentoo.git
    priority: -1000

Dangerous_Local_Overlay
    location: /usr/local/portage
    masters: gentoo

ACCEPT_KEYWORDS="amd64 ~amd64"

... and much more ....

--

Question 2: Eix is broken or does not like git

And i am not comfortable with equery tool; equery y gcc (for example gives some output, but what is

Code: Select all

equery y gcc
Keywords for sys-devel/gcc:
             |                                 | u        |  
             | a a   a         n   p r     s   | n        |  
             | l m   r h i m m i   p i s   p   | u s      | r
             | p d a m p a 6 i o p c s 3   a x | s l      | e
             | h 6 r 6 p 6 8 p s p 6 c 9 s r 8 | e o      | p
             | a 4 m 4 a 4 k s 2 c 4 v 0 h c 6 | d t      | o
-------------+---------------------------------+----------+-------
  2.95.3-r10 | ~ o o o o o o o o ~ o o o o ~ ~ | o 2.95.3 | gentoo
-------------+---------------------------------+----------+-------
   3.3.6-r1  | o ~ o o o o o o o o o o o o o ~ | o 3.3.6  | gentoo
-------------+---------------------------------+----------+-------
   3.4.6-r2  | + + + * * ~ * ~ * + + * ~ ~ + + | o 3.4.6  | gentoo
-------------+---------------------------------+----------+-------
   4.0.4     | o o o o o o o o o o o o o o o o | o 4.0.4  | gentoo
-------------+---------------------------------+----------+-------
   4.1.2     | + + + * + + ~ ~ * + + * ~ ~ + + | o 4.1.2  | gentoo
-------------+---------------------------------+----------+-------
   4.2.4-r1  | ~ ~ ~ o + ~ ~ o o ~ ~ o o o ~ ~ | o 4.2.4  | gentoo
-------------+---------------------------------+----------+-------
   4.3.6-r1  | + + + o - + ~ ~ o + + o ~ ~ + + | o 4.3.6  | gentoo
-------------+---------------------------------+----------+-------
   4.4.7     | + + + o + + ~ ~ o + + o ~ ~ + + | o 4.4.7  | gentoo
-------------+---------------------------------+----------+-------
   4.5.4     | + + + o + + ~ ~ o + + o ~ ~ + + | o 4.5.4  | gentoo
-------------+---------------------------------+----------+-------
   4.6.4     | + + + o + + ~ ~ o + + o ~ ~ + + | o 4.6.4  | gentoo
-------------+---------------------------------+----------+-------
   4.7.4     | + + + o + + + ~ o + + o + + + + | o 4.7    | gentoo
-------------+---------------------------------+----------+-------
   4.8.0     | ~ ~ ~ o ~ ~ ~ ~ o ~ ~ o ~ ~ ~ ~ | # 4.8    | gentoo
   4.8.1-r1  | ~ ~ ~ o ~ ~ ~ ~ o ~ ~ o ~ ~ ~ ~ | #        | gentoo
   4.8.2     | ~ ~ ~ + ~ ~ ~ ~ o ~ ~ o ~ ~ ~ ~ | #        | gentoo
   4.8.3     | ~ + + + + ~ + ~ o + + o + + + + | #        | gentoo
   4.8.4     | + + + + + ~ + ~ o + + o + + + + | #        | gentoo
   4.8.5     | + + + + + ~ + ~ o + + o + + + + | o        | gentoo
-------------+---------------------------------+----------+-------
   4.9.0     | o o o o ~ o o o o o o o o o o o | # 4.9    | gentoo
   4.9.1     | o o o o ~ o o o o o o o o o o o | #        | gentoo
   4.9.2     | ~ ~ ~ ~ ~ ~ ~ ~ o ~ ~ o ~ ~ ~ ~ | #        | gentoo
[I]4.9.3     | + + + + + ~ + ~ o + + o + + ~ + | o        | gentoo
-------------+---------------------------------+----------+-------
   5.1.0     | o o o o o o o o o o o o o o o o | # 5      | gentoo
   5.2.0     | o o o o o o o o o o o o o o o o | #        | gentoo
[I]5.3.0     | ~ ~ ~ ~ ~ ~ ~ ~ o ~ ~ o ~ ~ ~ ~ | o        | gentoo

I really wonder what o means? Does o means, it does nto exists anymore?
I realized last time that portage kicked out my gcc 5.2 and replaced it instantly with gcc 5.3

It is late and i have a cold. Is there an easy way to get eix working again with git please?

I also tried emege --regen (or what it is called)

Dependency resolution takes a very long time on a ssd too (well i changed the ssd recently but still i do not expect such delays) I think emerge --regen speeded it up a bit ...

Thanks

[ct85711]

I've noticed the same on the dependency resolution using git. Though, the time doesn't change much even if I had the metadata/cache regenerated (besides that command taking several minutes to complete).

[charles17]

Hi, I do not know where to ask so:

How can I tell how old my portage tree is now? In the old days with rsync there was a line wiht timestamp of tree ....

There should still be /usr/portage/metadata/timestamp.chk, even with sync-type = git.

I was forced to change to git as i realized that my portage won't update anymore. Some weird error.
So I removed the portage tree by hand, and changed hte file below. It seems my box works now

Code: Select all

cat /etc/portage/repos.conf/gentoo.conf 
[DEFAULT] 
main-repo = gentoo 

[gentoo] 
location = /usr/portage 
sync-type = git 
sync-uri = https://github.com/gentoo/gentoo.git 
auto-sync = yes 

Have you tried with https://github.com/gentoo-mirror/gentoo.git instead of https://github.com/gentoo/gentoo.git?, See the older version of this wiki article.

[Roman_Gruber]

I just wanted to say that rsync was broken. (basically removed /usr/portage; the distfiles are on a second disc; tried emerge-webrsync, but ended up in editing that resolv.conf to somethign which the wiki suggested at that point of that day)

The git stuff which i posted seems to work now. (just the lines are mixed up in a different order and as you pointed out now, the git link seems a bit different)

So is "https://github.com/gentoo-mirror/gentoo.git" this the new suggestion?

I did not read for quite a while the forums so I have no glue what the latest suggestion for git is. Thanks

we should tell the portage package coder, that he may add a timestamp thing to that git thing too, something human readable, so we can see, okay the tree was synced on this date according to ntp, or is up to date as of the git timestamp or something like that ... just something human readable.

--

thanks for your input

Code: Select all

ls -alh /usr/portage/metadata
total 20K
drwxr-xr-x   3 root root 4,0K Dez 11 05:11 .
drwxr-xr-x 171 root root 4,0K Dez 11 05:11 ..
-rw-r--r--   1 root root  148 Dez 11 05:11 .gitignore
drwxr-xr-x   2 root root 4,0K Dez 11 05:11 install-qa-check.d
-rw-r--r--   1 root root 1,3K Dez 11 05:11 layout.conf
ASUS-G75VW portage # cat /usr/portage/metadata/.gitignore 
# These are added during tree generation only.
/cache
/dtd
/glsa
/md5-cache
/news
/herds.xml
/timestamp
/timestamp.chk
/timestamp.x
/pkg_desc_index

I do not have that timestamp thing. I will try tommorow to change the git source url and see if i get that timestamp file on my box.

ty

There should still be /usr/portage/metadata/timestamp.chk, even with sync-type = git.

For some reason I can not find this file here. I checked with the command line interface and commands ls -ali to see any hidden files also.

[Roman_Gruber]

Thanks for the input, but sadly no timestamp. I changed it accordingly.

Code: Select all

emerge --sync
>>> Syncing repository 'gentoo' into '/usr/portage'...
/usr/bin/git pull
remote: Counting objects: 200, done.
remote: Compressing objects: 100% (83/83), done.
remote: Total 200 (delta 146), reused 170 (delta 117), pack-reused 0
Receiving objects: 100% (200/200), 62.76 KiB | 0 bytes/s, done.
Resolving deltas: 100% (146/146), completed with 74 local objects.
From https://github.com/gentoo/gentoo
   e5ce90a..b9b38fa  master     -> origin/master
Updating e5ce90a..b9b38fa
Fast-forward
 app-backup/luckybackup/luckybackup-0.4.8.ebuild                                     |   2 +-
 app-misc/elasticsearch/Manifest                                                     |   1 +
 app-misc/elasticsearch/elasticsearch-2.1.0.ebuild                                   |  62 +++++++++++++++++++++++
 app-misc/elasticsearch/files/elasticsearch.init5                                    |  11 +++++
 app-misc/elasticsearch/metadata.xml                                                 |   7 +--
 dev-games/crystalspace/crystalspace-2.0-r1.ebuild                                   |   2 +-
 dev-java/jacl/Manifest                                                              |   2 +-
 dev-java/jacl/files/1.3.3-javacflags.patch                                          |  36 --------------
 dev-java/jacl/files/jacl-1.4.1-build.patch                                          |  39 ---------------
 dev-java/jacl/jacl-1.4.1-r1.ebuild                                                  |   4 +-
 dev-java/jacl/jacl-1.4.1.ebuild                                                     |  51 -------------------
 dev-java/netbeans-java/{netbeans-java-8.1-r1.ebuild => netbeans-java-8.1-r2.ebuild} |   5 +-
 dev-java/tomcat-native/Manifest                                                     |   1 +
 dev-java/tomcat-native/tomcat-native-1.2.3.ebuild                                   |  58 ++++++++++++++++++++++
 dev-libs/DirectFB/DirectFB-1.7.6.ebuild                                             |   3 +-
 eclass/kde5.eclass                                                                  |   6 ++-
 games-board/blokish/blokish-0.9.4-r2.ebuild                                         |   2 +-
 games-strategy/scorched3d/scorched3d-44-r1.ebuild                                   |   2 +-
 games-util/wxchtdecoder/wxchtdecoder-1.5a-r1.ebuild                                 |   2 +-
 kde-apps/ark/{ark-15.08.3.ebuild => ark-15.08.3-r1.ebuild}                          |   2 +
 kde-apps/ark/files/ark-15.08.3-fix-lingering-processes.patch                        |  42 ++++++++++++++++
 kde-plasma/plasma-workspace/Manifest                                                |   1 +
 kde-plasma/plasma-workspace/plasma-workspace-5.5.1.1.ebuild                         | 173 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 media-libs/opencv/opencv-3.0.0.ebuild                                               |   3 +-
 media-sound/mumble/Manifest                                                         |   2 +-
 media-sound/mumble/{mumble-1.2.10.ebuild => mumble-1.2.11.ebuild}                   |   5 +-
 media-sound/mumble/mumble-1.2.8.ebuild                                              | 128 -----------------------------------------------
 media-sound/murmur/Manifest                                                         |   2 +-
 media-sound/murmur/{murmur-1.2.8.ebuild => murmur-1.2.11.ebuild}                    |   0
 media-sound/qtagger/qtagger-1.0.1-r2.ebuild                                         |   2 +-
 media-video/smplayer/Manifest                                                       |   2 +-
 media-video/smplayer/{smplayer-14.9.0.6994.ebuild => smplayer-15.11.0.ebuild}       |   4 ++
 net-fs/samba/Manifest                                                               |   9 ++--
 net-fs/samba/files/4.0/com_err.patch                                                |  35 -------------
 net-fs/samba/files/4.0/samba4.confd                                                 |  38 --------------
 net-fs/samba/files/4.0/samba4.initd-r1                                              |  56 ---------------------
 net-fs/samba/samba-4.0.26-r1.ebuild                                                 | 186 --------------------------------------------------------------------
 net-fs/samba/{samba-4.1.21.ebuild => samba-4.1.22.ebuild}                           |   2 +-
 net-fs/samba/samba-4.2.6.ebuild                                                     | 197 ------------------------------------------------------------------------
 net-fs/samba/{samba-4.2.5.ebuild => samba-4.2.7.ebuild}                             |   2 +-
 net-fs/samba/samba-4.3.1.ebuild                                                     | 196 ------------------------------------------------------------------------
 net-fs/samba/{samba-4.3.2.ebuild => samba-4.3.3.ebuild}                             |   2 +-
 net-ftp/pure-ftpd/pure-ftpd-1.0.40.ebuild                                           |   2 +-
 net-ftp/pure-ftpd/pure-ftpd-1.0.41.ebuild                                           |   2 +-
 net-ftp/pure-ftpd/pure-ftpd-1.0.42-r1.ebuild                                        | 144 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 net-ftp/pure-ftpd/pure-ftpd-1.0.42.ebuild                                           |   2 +-
 net-libs/librsync/Manifest                                                          |   1 +
 net-libs/librsync/librsync-2.0.0.ebuild                                             |  28 +++++++++++
 net-misc/smb4k/smb4k-1.2.1.ebuild                                                   |   2 +-
 sci-physics/lammps/Manifest                                                         |   2 +
 sci-physics/lammps/lammps-20151207.ebuild                                           | 217 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sci-physics/lammps/lammps-20151208.ebuild                                           | 217 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sys-kernel/hardened-sources/Manifest                                                |   5 ++
 sys-kernel/hardened-sources/hardened-sources-4.3.3.ebuild                           |  45 +++++++++++++++++
 sys-libs/ldb/Manifest                                                               |   3 +-
 sys-libs/ldb/ldb-1.1.21.ebuild                                                      |  77 -----------------------------
 sys-libs/ldb/{ldb-1.1.23.ebuild => ldb-1.1.24.ebuild}                               |   0
 x11-misc/xfe/xfe-1.40.1.ebuild                                                      |   2 +-
 58 files changed, 1052 insertions(+), 1082 deletions(-)
 create mode 100644 app-misc/elasticsearch/elasticsearch-2.1.0.ebuild
 create mode 100644 app-misc/elasticsearch/files/elasticsearch.init5
 delete mode 100644 dev-java/jacl/files/1.3.3-javacflags.patch
 delete mode 100644 dev-java/jacl/files/jacl-1.4.1-build.patch
 delete mode 100644 dev-java/jacl/jacl-1.4.1.ebuild
 rename dev-java/netbeans-java/{netbeans-java-8.1-r1.ebuild => netbeans-java-8.1-r2.ebuild} (98%)
 create mode 100644 dev-java/tomcat-native/tomcat-native-1.2.3.ebuild
 rename kde-apps/ark/{ark-15.08.3.ebuild => ark-15.08.3-r1.ebuild} (95%)
 create mode 100644 kde-apps/ark/files/ark-15.08.3-fix-lingering-processes.patch
 create mode 100644 kde-plasma/plasma-workspace/plasma-workspace-5.5.1.1.ebuild
 rename media-sound/mumble/{mumble-1.2.10.ebuild => mumble-1.2.11.ebuild} (94%)
 delete mode 100644 media-sound/mumble/mumble-1.2.8.ebuild
 rename media-sound/murmur/{murmur-1.2.8.ebuild => murmur-1.2.11.ebuild} (100%)
 rename media-video/smplayer/{smplayer-14.9.0.6994.ebuild => smplayer-15.11.0.ebuild} (96%)
 delete mode 100644 net-fs/samba/files/4.0/com_err.patch
 delete mode 100644 net-fs/samba/files/4.0/samba4.confd
 delete mode 100644 net-fs/samba/files/4.0/samba4.initd-r1
 delete mode 100644 net-fs/samba/samba-4.0.26-r1.ebuild
 rename net-fs/samba/{samba-4.1.21.ebuild => samba-4.1.22.ebuild} (99%)
 delete mode 100644 net-fs/samba/samba-4.2.6.ebuild
 rename net-fs/samba/{samba-4.2.5.ebuild => samba-4.2.7.ebuild} (99%)
 delete mode 100644 net-fs/samba/samba-4.3.1.ebuild
 rename net-fs/samba/{samba-4.3.2.ebuild => samba-4.3.3.ebuild} (99%)
 create mode 100644 net-ftp/pure-ftpd/pure-ftpd-1.0.42-r1.ebuild
 create mode 100644 net-libs/librsync/librsync-2.0.0.ebuild
 create mode 100644 sci-physics/lammps/lammps-20151207.ebuild
 create mode 100644 sci-physics/lammps/lammps-20151208.ebuild
 create mode 100644 sys-kernel/hardened-sources/hardened-sources-4.3.3.ebuild
 delete mode 100644 sys-libs/ldb/ldb-1.1.21.ebuild
 rename sys-libs/ldb/{ldb-1.1.23.ebuild => ldb-1.1.24.ebuild} (100%)
=== Sync completed for gentoo
ASUS-G75VW ~ # cat /etc/portage/repos.conf/gentoo.conf 
[DEFAULT] 
main-repo = gentoo 

[gentoo] 
location = /usr/portage 
sync-type = git 
sync-uri = https://github.com/gentoo-mirror/gentoo.git
auto-sync = yes 
ASUS-G75VW ~ # emerge --info
Portage 2.2.26 (python 2.7.11-final-0, default/linux/amd64/13.0/desktop, gcc-5.3.0, glibc-2.22-r1, 4.3.2-gentoo_2015-12-13 x86_64)
=================================================================
System uname: Linux-4.3.2-gentoo_2015-12-13-x86_64-Intel-R-_Core-TM-_i7-3610QM_CPU_@_2.30GHz-with-gentoo-2.2
KiB Mem:    16399544 total,   1272120 free
KiB Swap:          0 total,         0 free
sh bash 4.3_p42
ld GNU ld (Gentoo 2.25.1 p1.1) 2.25.1
app-shells/bash:          4.3_p42::gentoo
dev-java/java-config:     2.2.0::gentoo
dev-lang/perl:            5.22.0::gentoo
dev-lang/python:          2.7.11::gentoo, 3.4.3-r5::gentoo
dev-util/cmake:           3.4.1::gentoo
dev-util/pkgconfig:       0.29::gentoo
sys-apps/baselayout:      2.2::gentoo
sys-apps/openrc:          0.19.1::gentoo
sys-apps/sandbox:         2.9::gentoo
sys-devel/autoconf:       2.13::gentoo, 2.69-r1::gentoo
sys-devel/automake:       1.10.3-r1::gentoo, 1.11.6-r1::gentoo, 1.12.6::gentoo, 1.13.4::gentoo, 1.14.1::gentoo, 1.15::gentoo
sys-devel/binutils:       2.25.1-r1::gentoo
sys-devel/gcc:            4.9.3::gentoo, 5.3.0::gentoo
sys-devel/gcc-config:     1.8::gentoo
sys-devel/libtool:        2.4.6-r1::gentoo
sys-devel/make:           4.1-r1::gentoo
sys-kernel/linux-headers: 4.3::gentoo (virtual/os-headers)
sys-libs/glibc:           2.22-r1::gentoo
Repositories:

gentoo
    location: /usr/portage
    sync-type: git
    sync-uri: https://github.com/gentoo-mirror/gentoo.git
    priority: -1000

Dangerous_Local_Overlay
    location: /usr/local/portage
    masters: gentoo

ACCEPT_KEYWORDS="amd64 ~amd64"
ACCEPT_LICENSE="*"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-march=native -O2 -pipe -fomit-frame-pointer"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/share/config /usr/share/gnupg/qualified.txt /var/lib/hsqldb"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo"
CXXFLAGS="-march=native -O2 -pipe -fomit-frame-pointer"
DISTDIR="/mnt/sdb2/usr/portage/distfiles"
FCFLAGS="-O2 -pipe"
FEATURES="assume-digests binpkg-logs config-protect-if-modified distlocks ebuild-locks fixlafiles merge-sync news parallel-fetch preserve-libs protect-owned sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr"
FFLAGS="-O2 -pipe"
GENTOO_MIRRORS="http://gentoo.inode.at/ http://ftp.first-world.info/ http://linux.rz.ruhr-uni-bochum.de/download/gentoo-mirror/ ftp://ftp.uni-erlangen.de/pub/mirrors/gentoo ftp://mirror.netcologne.de/gentoo/  ftp://ftp.vectranet.pl/gentoo/ http://distfiles.gentoo.org/   ftp://ftp.uni-erlangen.de/pub/mirrors/gentoo ftp://mirrors.sec.informatik.tu-darmstadt.de/gentoo/ http://ftp-stud.fht-esslingen.de/pub/Mirrors/gentoo/ ftp:///ftp-stud.fht-esslingen.de/pub/Mirrors/gentoo/ ftp://distro.ibiblio.org/pub/Linux/distributions/gentoo/ http://distro.ibiblio.org/pub/Linux/distributions/gentoo/  ftp://ftp.ussg.iu.edu/pub/linux/gentoo ftp://ftp.ucsb.edu/pub/mirrors/linux/gentoo/ ftp://ftp.join.uni-muenster.de/pub/linux/distributions/gentoo ftp://ftp.wh2.tu-dresden.de/pub/mirrors/gentoo http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/ http://ftp-stud.fht-esslingen.de/pub/Mirrors/gentoo/ ftp:///ftp-stud.fht-esslingen.de/pub/Mirrors/gentoo/ ftp://ftp.gentoo.mesh-solutions.com/gentoo/ http://mirror.switch.ch/mirror/gentoo/ ftp://mirror.switch.ch/mirror/gentoo/ ftp://ftp.solnet.ch/mirror/Gentoo"
LANG="en"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
MAKEOPTS="-j8"
PKGDIR="/usr/portage/packages"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
PORTAGE_TMPDIR="/var/tmp"
USE="64bit 7zip S3TC X X509 a52 aac aacplus acpi aimodules aio alsa amd64 amr amrnb amrwb ao apm apng archive ares aspell assistant atmo audacious audiofile automount autotrace avx bash-completion battstat berkdb bidi binfilter bittorrent bl blender-game boo btrfs bzip2 cairo caja cdda cddax cddb cdio cdparanoia cdr cdrom chm cilk clang cli clucene clutter clvm consolekit context contrast coverage cpufreq_bench cpuload cracklib crypt cryptsetup ctypes-python cuda cups curl custom-optimization cxx dbus declarative device-mapper devil dga dhcpcd dia dirac directfb djvu dmraid dns dos dri dts dv dvd dvdr edd emboss emf emovix enca encode epiphany equalizer evdev ewf exif expat f2fs faac faad fam fat fbcon ffmpeg fftw firefox fits flac flash flickr floppy fluidsynth fontconfig fortran fpx ftp fts3 g3dvl gadu gcj gconf gcrypt gd gdbm gdk-pixbuf gdm ggi gif gimp git gjs glade glut gmp gmplayer gnutls gold gost gpg gpm graphite graphviz grilo groovy groupwise gs gsm gtk gtk3 gucharmap guile gzip-el hddtemp hdri hfs hotpixels http iconv icu id3 id3tag idn imagemagick imlib imlib2 inkjar inotify introspection ipp irrlicht jabber jack java javascript jbig jfs jit joystick jpeg jpeg2k justify krb4 ladspa lame lapack lasi lcdfilter lcms lensfun libass libev libevent libffi libkms libnl libproxy libsamplerate libssh2 libsysfs libv4l libv4l2 libvisual live llvm lqr lua lvm lvm2 lxde lximage lzma lzo mad mapimg matroska md5sum md5sum-external mdadm mdev meanwhile mercurial midi mikmod minimal minizip mjpeg mms mmx mmxext mng mod modplug modules mono moonlight motif mp3 mp4 mpd mpeg mpeg2 mpeg3 mpfi mplayer mtp multicore multilib multimedia musepack mxit mysql nas nautilus ncat ncurses networking newnet nntp nping nptl nsplugin ntfs ntfsdecrypt ntfsprogs numa nut nuv nvcontrol nvidia ogg ogre ois openal opencl opencore-amr openexr opengl openmp openrc openssl optimisememory optimized-qmake opus orbit osc osmesa oss pam pango pcre pdf pdfimport perl pipelight plotutils png pnm policykit postproc postscript ppds pptx prediction pulseaudio pvr python qt-dbus qt3support qt4 quicktime radio rar raw rdoc readline realtime redland reiser4 reiserfs resolvconf rle rrdcgi rtmp rtsp sasl schroedinger script sdl sdl-image sdlgfx seccomp secure-delete sensors session sftp sha1 shine shout silc sip skype smi smp smpeg snappy sndfile sound soundex soundtouch sox speex spoof-source sql sse sse2 sse2_4way sse2check sse3 sse4 sse4_1 ssl ssse3 staging startup-notification stream subversion svg sync-plugin-portage sysstat system-jflex system-jsoncpp system-sqlite systemtap taglib tcpd templates theora threads tiff tinfo tonal toolkit-scroll-bars truetype twolame udev udisks unicode unlock-notify upcall upower usb uvm v4l v4l2 vaapi vamp vcd vcdinfo vcdx vdpau vhook vlc vlm vorbis vpx vte wacom wav wavpack weather-metar weather-xoap webp websockets wifi wikipedia winbind wireshark wma wma-fixed wmf x264 x265 xanim xattr xcb xcomposite xfs xft xinerama xml xmlpatterns xmp xosd xpm xps xpsmall xscreensaver xv xvfb xvid yuv4mpeg yv12 zephyr zlib zsh-completion zvbi" ABI_X86="32 64" ALSA_CARDS="hda-intel" APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="kexi words flow plan sheets stage tables krita karbon braindump author" CAMERAS="ptp2" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" CPU_FLAGS_X86="aes avx mmx mmxext popcnt sse sse2 sse3 sse4_1 sse4_2 ssse3" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip tripmate tnt ublox ubx" GRUB_PLATFORMS="efi-64" INPUT_DEVICES="evdev synaptics keyboard mouse wacom joystick" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" LINGUAS="en" OFFICE_IMPLEMENTATION="libreoffice" PHP_TARGETS="php5-5" PYTHON_SINGLE_TARGET="python3_4" PYTHON_TARGETS="python2_7 python3_4" RUBY_TARGETS="ruby22 ruby21" USERLAND="GNU" VIDEO_CARDS="nvidia" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account"
Unset:  CC, CPPFLAGS, CTARGET, CXX, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LC_ALL, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, USE_PYTHON

ASUS-G75VW ~ # 

previous line i used:
https://github.com/gentoo/gentoo
The official mirror the Gentoo ebuild repository (now in true git!)

suggested: and in use now
https://github.com/gentoo-mirror/gentoo
Official Gentoo ebuild repository http://gentoo.org/

Seeems to be similar when it says mirror ...

[charles17]

For some reason I can not find this file here. I checked with the command line interface and commands ls -ali to see any hidden files also.

See in https://github.com/gentoo-mirror/gentoo ... r/metadata

[Roman_Gruber]

Code: Select all

find /  -name timestamp.chk
find: ‘/proc/6539’: No such file or directory
find: ‘/proc/6540’: No such file or directory
find: ‘/proc/9053’: No such file or directory

I hardly use the find tool, but I am quite sure, my box does not have that timestamp file. At least it exists on the github thing ...

To quote myself. It seems that gitignore by "gentoo" forces to not provide the timestamp.chk file right?
Or what do these entry really do, in the file below?

cat /usr/portage/metadata/.gitignore
# These are added during tree generation only.
/cache
/dtd
/glsa
/md5-cache
/news
/herds.xml
/timestamp
/timestamp.chk
/timestamp.x
/pkg_desc_index

--

just to test it out, i created as user root that timestamp file and added the line which was shown on my browser.

Code: Select all

cat /usr/portage/metadata/timestamp.chk 
Wed, 16 Dec 2015 15:02:30 +0000
ASUS-G75VW metadata # emerge --info|head
Portage 2.2.26 (python 2.7.11-final-0, default/linux/amd64/13.0/desktop, gcc-5.3.0, glibc-2.22-r1, 4.3.2-gentoo_2015-12-13 x86_64)
=================================================================
System uname: Linux-4.3.2-gentoo_2015-12-13-x86_64-Intel-R-_Core-TM-_i7-3610QM_CPU_@_2.30GHz-with-gentoo-2.2
KiB Mem:    16399544 total,   3831212 free
KiB Swap:          0 total,         0 free
Timestamp of repository gentoo: Wed, 16 Dec 2015 15:02:30 +0000
sh bash 4.3_p42
ld GNU ld (Gentoo 2.25.1 p1.1) 2.25.1
app-shells/bash:          4.3_p42::gentoo
dev-java/java-config:     2.2.0::gentoo

I instantly removed that file again from my box after the test. I conclude, the git stuff does not fetch this file for some reason and because of this missing file my box does not show a timestamp!

[ct85711]

To quote myself. It seems that gitignore by "gentoo" forces to not provide the timestamp.chk file right?
Or what do these entry really do, in the file below?

cat /usr/portage/metadata/.gitignore
# These are added during tree generation only.
/cache
/dtd
/glsa
/md5-cache
/news
/herds.xml
/timestamp
/timestamp.chk
/timestamp.x
/pkg_desc_index

--

ok, from everything I've learned from using git, you are right in what .gitignore does. It specifically tells git to ignore the listed files or directories as if they never existed to begin with. I may be wrong but, portage uses the /cache and/or the md5-cache folder to help speed up the dependency resolution. The thing that I never understood, was why do they have these in the .gitignore and advised we make some post-hooks to retrieve them anyways, then they have a copy in the git tree... (going by the old git thread in Gentoo Chat) Or in the case of the the cache and md5-cahce, we could regen them ourselves.. https://wiki.gentoo.org/wiki/Egencache

[Roman_Gruber]

Hi, may I just ask.

This egencache only speeds up dependency resolution right? So when i want to emerge something i have to wait less for the final output when i use the -av flag (ask and verbose flags)?

egencache is a tool that rebuilds metadata information for the Portage tree.

That stuff sounds all very consistent for somenoe who deals with that stuff but for myself the wiki really tells me nothing. sorry for beeing an honest person, but I do not understand waht this tool really does or why I should run it in the first place.

https://wiki.gentoo.org/wiki/Egencache

[ct85711]

Honestly, I am no expert on how portage works, and even worse on git (I still consider myself a noob on git).

From my understanding, when we used the old rysnc, it downloaded a copy of the cache (among others, like news, dtd, glsa, etc) for us, so we never needed to worry about it. However, the devs decided on git, to not include the cache and stuff when we sync (hence why it's in the ignore file). To make up for it, the egencache rebuilds the cache that would have been downloaded when we used rysnc (it's not an new tool, we've had it for a long time, just ignored as it wasn't necessary most times). As far as if it actually will speed up the dependency resolution, I can't say for sure. What I do know, for me I got tired of wasting nearly 10-20 minutes waiting for it to finish (often looks like it froze most times), just to wait for dependency resolution to finish (maybe a little faster). You are welcome to run some time tests, and see if it actually helps or not. Otherwise I'd love to see a dev or someone more knowledgeable to clearify some of this.

[Roman_Gruber]

yes exactly we need some input, to fix those "cosmetical" issues.

I have my stuff on a cheapy ssd but still it takes ages.

[steveL]

From my understanding, when we used the old rysnc, it downloaded a copy of the cache (among others, like news, dtd, glsa, etc) for us, so we never needed to worry about it.

Heh, the old old rsync never used to, either, as [post=3891968]this old tip shows[/post].

Developers using a cvs tree could never use -metadata-transfer, though don't ask me for the technical ins and outs. I just recall Patrick mentioning it, along with how he couldn't use eix either. This came up a few times, as I've always recommended eix, and didn't understand why it's not one of the base gentoo utils (like portage-utils, or gentoolkit.)

Not sure why it's not included this time, though it makes sense not to run it in a post-commit hook on the git repo used for collaboration. It would make sense to have it at the next stage, where you have an rsync server reading from, which I'd guess the gentoo-mirror repo is for, though it would be in a checkout, as per gitolite deployment, not the actual bare repo.

Wondering, does adding metadata-transfer to FEATURES help any? (If you have a system you can test on.)
It used to take time after every sync, which is what the above tip was about, but it sounds like it needs to happen.

[ct85711]

I was going by what the wiki that I linked to earlier said about the cache, on where rsync transferred the cache, though it did mention cvs and git does not do that. Of course the wiki may very well be wrong, and needs to be updated.

metadata-transfer
Automatically perform a metadata transfer when `emerge --sync` is run. In versions of portage >=2.1.5, this feature is disabled by default. When
metadata-transfer is disabled, metadata cache from the ${repository_location}/metadata/md5-cache/ directory will be used directly (if available).

Now I may not be understanding this properly, but this tells me that it will transfer the meta during sync, but the .gitignore specifically says to ignore that directory (md5-cache). So I would think that it wouldn't matter what the metadata-transfer is set to, as git won't grab it anyways...